diff --git a/citizen-intelligence-agency/build.xml b/citizen-intelligence-agency/build.xml index b15edcce04..7768c8cfa4 100644 --- a/citizen-intelligence-agency/build.xml +++ b/citizen-intelligence-agency/build.xml @@ -28,7 +28,7 @@ + line="-B --file pom.xml clean install -pl !cia-dist-deb -Prelease-site,all-modules -DforkMode=once '-Dtest=!**ITest*,!**DocumentationTest*' -Dmaven.test.failure.ignore=true -DfailIfNoTests=false -Dsurefire.failIfNoSpecifiedTests=false -Dsurefire.reportNameSuffix=UNIT" /> @@ -48,7 +48,7 @@ + line="clean install -T 1.5C -pl !cia-dist-deb -Pall-modules -Dhttps.protocols=TLSv1.2 -Dmaven.test.failure.ignore=true" /> @@ -64,10 +64,10 @@ - + + line="clean install -Pall-modules -Dtest=no -DfailIfNoTests=false -Dsurefire.failIfNoSpecifiedTests=false -pl '!cia-dist-deb,!cia-dist-cloudformation'" /> @@ -125,7 +125,7 @@ + line="clean install site -Prelease-site -Dtest=no -DfailIfNoTests=false -Dsurefire.failIfNoSpecifiedTests=false -DforkMode=once -Dannotation.failOnError=false" /> diff --git a/citizen-intelligence-agency/pom.xml b/citizen-intelligence-agency/pom.xml index 888f98fc9a..cf8519b1be 100644 --- a/citizen-intelligence-agency/pom.xml +++ b/citizen-intelligence-agency/pom.xml @@ -47,7 +47,6 @@ org.hibernate hibernate-jpamodelgen - ${cia.project.versions.hibernate} org.slf4j @@ -1422,7 +1421,6 @@ commons-beanutils commons-beanutils - 1.10.0 @@ -1511,7 +1509,6 @@ jetty cn=localhost, ou=None, L=None, ST=None, o=None, c=SE SHA256withRSA - 365 RSA 4096 @@ -1686,45 +1683,6 @@ - - org.eclipse.jetty - jetty-maven-plugin - - - - logback.configurationFile - src/main/resources/logback.xml - - - slf4j - true - - - 9966 - stop - 0 - - /cia - - - - - org.eclipse.jetty - jetty-servlets - ${cia.project.versions.jetty} - - - org.ow2.asm - asm-tree - ${cia.project.versions.asm} - - - org.ow2.asm - asm - ${cia.project.versions.asm} - - - diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemAdminConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemAdminConstants.java new file mode 100644 index 0000000000..5cd2322b4a --- /dev/null +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemAdminConstants.java @@ -0,0 +1,62 @@ +package com.hack23.cia.web.impl.ui.application.views.common.menufactory.api; + +/** + * The Interface MenuItemAdminConstants. + */ +public interface MenuItemAdminConstants { + + /** The admin text. */ + String ADMIN_TEXT = "Admin"; + + /** The agency. */ + String AGENCY = "Agency"; + + /** The agent operations text. */ + String AGENT_OPERATIONS_TEXT = "Agent operations"; + + /** The application. */ + String APPLICATION = "Application"; + + /** The application configuration. */ + String APPLICATION_CONFIGURATION = "System settings"; + + /** The application event. */ + String APPLICATION_EVENT = "Application Event"; + + /** The application event charts. */ + String APPLICATION_EVENT_CHARTS = "Application Event charts"; + + /** The application session. */ + String APPLICATION_SESSION = "Application Session"; + + /** The application session charts. */ + String APPLICATION_SESSION_CHARTS = "Active Daily Users"; + + /** The system performance. */ + String SYSTEM_PERFORMANCE = "System Performance"; + + /** The management. */ + String MANAGEMENT = "Management"; + + /** The configuration. */ + String CONFIGURATION = "Configuration"; + + /** The portal. */ + String PORTAL = "Portal"; + + /** The email. */ + String EMAIL = "Email"; + + /** The language. */ + String LANGUAGE = "Language"; + + + /** The Constant DATA_AUTHOR_SUMMARY. */ + String DATA_AUTHOR_SUMMARY = "Data author summary"; + + /** The Constant DATA_SUMMARY_TEXT. */ + String DATA_SUMMARY_TEXT = "Data Summary"; + + + +} diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemCommitteeConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemCommitteeConstants.java new file mode 100644 index 0000000000..028f510915 --- /dev/null +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemCommitteeConstants.java @@ -0,0 +1,50 @@ +package com.hack23.cia.web.impl.ui.application.views.common.menufactory.api; + +/** + * Constants for committee-related menu items. + */ +public interface MenuItemCommitteeConstants { + + /** The committee ranking text. */ + // Base committee labels + String COMMITTEE_RANKING_TEXT = "Committee Ranking"; + + /** The committee roles. */ + String COMMITTEE_ROLES = "Committee Roles"; + + /** The committees link text. */ + String COMMITTEES_LINK_TEXT = "Committees"; + + /** The committee ranking description. */ + // Committee descriptions + String COMMITTEE_RANKING_DESCRIPTION = "Committees: shaping policy debates."; + + /** The committees description. */ + String COMMITTEES_DESCRIPTION = "All committees: roles and responsibilities."; + + /** The committee roles description. */ + String COMMITTEE_ROLES_DESCRIPTION = "Committee roles description"; + + /** The page visit history description. */ + String PAGE_VISIT_HISTORY_DESCRIPTION = "View history of page visit for this page."; + + /** The documents text. */ + // Document and ballot related + String DOCUMENTS_TEXT = "Documents"; + + /** The ballots text. */ + String BALLOTS_TEXT = "Ballots"; + + /** The ballot decision summary text. */ + String BALLOT_DECISION_SUMMARY_TEXT = "Ballot Decision Summary"; + + /** The current committees text. */ + // Other committee constants + String CURRENT_COMMITTEES_TEXT = "Current Committees"; + + /** The committee history text. */ + String COMMITTEE_HISTORY_TEXT = "Committee History"; + + /** The committee details text. */ + String COMMITTEE_DETAILS_TEXT = "Committee Details"; +} diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemConstants.java new file mode 100644 index 0000000000..2e6d0f1f11 --- /dev/null +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemConstants.java @@ -0,0 +1,543 @@ +package com.hack23.cia.web.impl.ui.application.views.common.menufactory.api; + +/** + * The Interface MenuItemConstants. + */ +public interface MenuItemConstants extends + MenuItemLayoutConstants, + MenuItemPartyConstants, + MenuItemUserConstants, + MenuItemPoliticianConstants, + MenuItemDocumentConstants, + MenuItemCommitteeConstants, + MenuItemGovernmentConstants, + MenuItemNavigationConstants, + MenuItemAdminConstants, + MenuItemDataConstants, + MenuItemMinistryConstants, + MenuItemCountryConstants, + MenuItemDecisionConstants, + MenuItemStatisticsConstants, + MenuItemLeadershipConstants, + MenuItemParliamentConstants, + MenuItemRiskConstants, + MenuItemPageVisitConstants { + + /** The dashboard. */ + // Core navigation constants + String DASHBOARD = "Dashboard"; + + /** The main. */ + String MAIN = "Main"; + + /** The start text. */ + String START_TEXT = "Start"; + + /** The overview text. */ + String OVERVIEW_TEXT = "Overview"; + + /** The ranking text. */ + String RANKING_TEXT = "Ranking"; + + /** The by topic. */ + String BY_TOPIC = "By Topic"; + + /** The list all. */ + String LIST_ALL = "List All"; + + /** The login. */ + // Security related constants + String LOGIN = "Login"; + + /** The logout. */ + String LOGOUT = "Logout"; + + /** The register. */ + String REGISTER = "Register"; + + /** The role admin. */ + String ROLE_ADMIN = "ROLE_ADMIN"; + + /** The role user. */ + String ROLE_USER = "ROLE_USER"; + + /** The user home. */ + // UserHomeMenuItemFactoryImpl constants + String USER_HOME = "User Home"; + + /** The user profile. */ + String USER_PROFILE = "User Profile"; + + /** The user settings. */ + String USER_SETTINGS = "User Settings"; + + /** The user logout. */ + String USER_LOGOUT = "User Logout"; + + /** The user home description. */ + String USER_HOME_DESCRIPTION = "Navigate to user home page"; + + /** The user profile description. */ + String USER_PROFILE_DESCRIPTION = "View and edit user profile"; + + /** The user settings description. */ + String USER_SETTINGS_DESCRIPTION = "Adjust user settings"; + + /** The user logout description. */ + String USER_LOGOUT_DESCRIPTION = "Logout from the application"; + + + /** The Constant MANAGEMENT. */ + String MANAGEMENT = "Management"; + + /** 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"; + + /** The Constant SYSTEM_PERFORMANCE. */ + String SYSTEM_PERFORMANCE = "System Performance"; + + /** The Constant USER_ACTIVITY. */ + String USER_ACTIVITY = "User Activity"; + + /** The Constant USERACCOUNT. */ + String USERACCOUNT = "Useraccount"; + + /** The Constant USERHOME. */ + String USERHOME = "Userhome"; + + /** The Constant ALL_COMMITTEES_TOTAL_MEMBERS. */ + String ALL_COMMITTEES_TOTAL_MEMBERS = "All committees, total members"; + + /** The Constant CHART_BY_TOPIC_TEXT. */ + String CHART_BY_TOPIC_TEXT = "Chart by topic"; + + /** The Constant CURRENT_AND_PAST_MEMBER_AND_SUMMARY_OF_POLTICIAL_DAYS. */ + String CURRENT_AND_PAST_MEMBER_AND_SUMMARY_OF_POLTICIAL_DAYS = "Current and past member, polticial days"; + + /** The Constant CURRENT_COMMITTEES_CURRENT_MEMBERS_TEXT. */ + String CURRENT_COMMITTEES_CURRENT_MEMBERS_TEXT = "Current committees, current members"; + + /** The Constant CURRENT_PARTIES_ACTIVE_IN_COMMITTEES_CURRENT_ASSIGNMENTS. */ + String CURRENT_PARTIES_ACTIVE_IN_COMMITTEES_CURRENT_ASSIGNMENTS = "Current parties in committees"; + + /** + * The Constant + * CURRENT_PARTIES_ACTIVE_IN_COMMITTEES_TOTAL_DAYS_SERVED_IN_COMMITTEES. + */ + String CURRENT_PARTIES_ACTIVE_IN_COMMITTEES_TOTAL_DAYS_SERVED_IN_COMMITTEES = "Current parties,days served"; + + /** The Constant POLITICAL_WORK_SUMMARY_TEXT. */ + String POLITICAL_WORK_SUMMARY_TEXT = "Political Work Summary"; + + /** The Constant POLITICAL_WORK_SUMMARY_DESCRIPTION. */ + String POLITICAL_WORK_SUMMARY_DESCRIPTION = "Scoreboard over current member size, political days served and total assignments"; + + /** The Constant CURRENT_COMMITTEES_CURRENT_MEMBERS_DESCRIPTION. */ + String CURRENT_COMMITTEES_CURRENT_MEMBERS_DESCRIPTION = "Chart over current committees and member size"; + + /** + * The Constant + * CURRENT_PARTIES_ACTIVE_IN_COMMITTEES_CURRENT_ASSIGNMENTS_DESCRIPTION. + */ + String CURRENT_PARTIES_ACTIVE_IN_COMMITTEES_CURRENT_ASSIGNMENTS_DESCRIPTION = "Chart over current parties active in committees and member size"; + + /** + * The Constant + * CURRENT_PARTIES_ACTIVE_IN_COMMITTEES_TOTAL_DAYS_SERVED_IN_COMMITTEES_DESCRIPTION. + */ + String CURRENT_PARTIES_ACTIVE_IN_COMMITTEES_TOTAL_DAYS_SERVED_IN_COMMITTEES_DESCRIPTION = "Chart over current parties active in committees days served"; + + /** The Constant ALL_COMMITTEES_TOTAL_MEMBERS_DESCRIPTION. */ + String ALL_COMMITTEES_TOTAL_MEMBERS_DESCRIPTION = "Chart over all committees and member size"; + + /** The Constant DOCUMENT_ACTIVITY_TEXT. */ + String DOCUMENT_ACTIVITY_TEXT = "Document Activity"; + + /** The Constant DOCUMENT_ACTIVITY_DESCRIPTION. */ + String DOCUMENT_ACTIVITY_DESCRIPTION = "View document activity."; + + /** The Constant SECURITY_SETTING_TEXT. */ + String SECURITY_SETTING_TEXT = "Security Settings"; + + /** The Constant SECURITY_SETTINGS_DESCRIPTION. */ + String SECURITY_SETTINGS_DESCRIPTION = "View and update security settings."; + + /** The Constant USER_VISITS. */ + String USER_VISITS = "User Visits"; + + /** The Constant USER_VISITS_DESCRIPTION. */ + String USER_VISITS_DESCRIPTION = "View user visit history."; + + /** The Constant USER_EVENTS. */ + String USER_EVENTS = "User Events"; + + /** The Constant USER_EVENTS_DESCRIPTION = "View user event history."; */ + String USER_EVENTS_DESCRIPTION = "View user event history."; + + /** The Constant ROLES_TEXT. */ + String ROLES_TEXT = "Roles"; + + /** The Constant CURRENT_MEMBERS_TEXT. */ + String CURRENT_MEMBERS_TEXT = "Current Members"; + + /** The Constant MEMBER_HISTORY_TEXT. */ + String MEMBER_HISTORY_TEXT = "Member History"; + + /** The Constant DECISION_TYPE_DAILY_SUMMARY_TEXT. */ + String DECISION_TYPE_DAILY_SUMMARY_TEXT = "Decision Type Daily Summary"; + + /** The Constant CURRENT_MEMBERS_DESCRIPTION. */ + String CURRENT_MEMBERS_DESCRIPTION = "Current members description"; + + /** The Constant MEMBER_HISTORY_DESCRIPTION. */ + String MEMBER_HISTORY_DESCRIPTION = "Member history description"; + + /** The Constant ROLE_GHANT_DESCRIPTION. */ + String ROLE_GHANT_DESCRIPTION = "Role ghant description"; + + /** The Constant DOCUMENT_HISTORY_DESCRIPTION. */ + String DOCUMENT_HISTORY_DESCRIPTION = "Document history description"; + + /** The Constant BALLOT_DECISION_SUMMARY_DESCRIPTION. */ + String BALLOT_DECISION_SUMMARY_DESCRIPTION = "Ballot decision summary description"; + + /** The Constant DECISION_SUMMARY_DESCRIPTION. */ + String DECISION_SUMMARY_DESCRIPTION = "Decision summary description"; + + /** The Constant DECISION_TYPE_DAILY_SUMMARY_DESCRIPTION. */ + String DECISION_TYPE_DAILY_SUMMARY_DESCRIPTION = "Decision type daily summary description"; + + /** The Constant DECISION_FLOW_DESCRIPTION. */ + String DECISION_FLOW_DESCRIPTION = "Decision flow description"; + + /** The Constant COUNTRY_RANKING_TEXT. */ + String COUNTRY_RANKING_TEXT = "Country Ranking"; + + /** The Constant COUNTRY_OVERVIEW_TEXT. */ + String COUNTRY_OVERVIEW_TEXT = "Country Overview"; + + /** 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; + + /** The Constant MINIMUM_NUMBER_DATA_POINTS. */ + int MINIMUM_NUMBER_DATA_POINTS = 10; + + /** The Constant DOCUMENT. */ + String DOCUMENT = "Document"; + + /** The Constant DOCUMENT_OVERVIEW_TEXT. */ + String DOCUMENT_OVERVIEW_TEXT = "Document Overview"; + + /** The Constant PERSON_REFERENCES. */ + String PERSON_REFERENCES = "Person References"; + + /** The Constant DOCUMENT_DETAILS. */ + String DOCUMENT_DETAILS = "Document Details"; + + /** The Constant DOCUMENT_DATA. */ + String DOCUMENT_DATA = "Document Data"; + + /** The Constant DOCUMENT_REFERENCES. */ + String DOCUMENT_REFERENCES = "Document References"; + + /** The Constant DOCUMENT_DECISION. */ + String DOCUMENT_DECISION = "Document Decision"; + + /** 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"; + + /** The Constant REFERENCES_TO_INDIVIDUALS_IN_THE_DOCUMENT. */ + String REFERENCES_TO_INDIVIDUALS_IN_THE_DOCUMENT = "References to individuals in the document"; + + /** The Constant DETAILED_INFORMATION_ABOUT_THE_DOCUMENT. */ + String DETAILED_INFORMATION_ABOUT_THE_DOCUMENT = "Detailed information about the document"; + + /** The Constant COMPLETE_DOCUMENT_TEXT_AND_DATA. */ + String COMPLETE_DOCUMENT_TEXT_AND_DATA = "Complete document text and data"; + + /** The Constant REFERENCES_CITED_IN_THE_DOCUMENT. */ + String REFERENCES_CITED_IN_THE_DOCUMENT = "References cited in the document"; + + /** The Constant DECISIONS_AND_OUTCOMES_RELATED_TO_THE_DOCUMENT. */ + String DECISIONS_AND_OUTCOMES_RELATED_TO_THE_DOCUMENT = "Decisions and outcomes related to the document"; + + /** The Constant ATTACHMENTS_AND_SUPPLEMENTARY_FILES. */ + String ATTACHMENTS_AND_SUPPLEMENTARY_FILES = "Attachments and supplementary files"; + + /** The Constant GOVERNMENT_BODY_OVERVIEW_TEXT. */ + String GOVERNMENT_BODY_OVERVIEW_TEXT = "Government Body Overview"; + + /** The Constant HEADCOUNT_CHART. */ + String HEADCOUNT_CHART = "Headcount Chart"; + + /** The Constant INCOME. */ + String INCOME = "Income"; + + /** 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"; + + /** The Constant INCOME_DESCRIPTION. */ + String INCOME_DESCRIPTION = "Income description"; + + /** 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"; + + /** The Constant GOVERNMENT_BODIES_INCOME. */ + String GOVERNMENT_BODIES_INCOME = "Government Bodies Income"; + + /** The Constant GOVERNMENT_BODIES_EXPENDITURE. */ + String GOVERNMENT_BODIES_EXPENDITURE = "Government Bodies Expenditure"; + + /** The Constant GOVERNMENT_BODIES_HEADCOUNT_DESCRIPTION. */ + String GOVERNMENT_BODIES_HEADCOUNT_DESCRIPTION = "Government bodies headcount description"; + + /** The Constant GOVERNMENT_BODIES_INCOME_DESCRIPTION. */ + String GOVERNMENT_BODIES_INCOME_DESCRIPTION = "Government bodies income description"; + + /** The Constant GOVERNMENT_BODIES_EXPENDITURE_DESCRIPTION. */ + String GOVERNMENT_BODIES_EXPENDITURE_DESCRIPTION = "Government bodies expenditure description"; + + /** The Constant USER_HOME_OVERVIEW_TEXT. */ + String USER_HOME_OVERVIEW_TEXT = "User Home Overview"; + + /** The Constant SWEDEN_DASHBOARD. */ + String SWEDEN_DASHBOARD = "Sweden Dashboard"; + + /** The Constant COMMITTEE_RANKING_TEXT. */ + String COMMITTEE_RANKING_TEXT = "Committee Ranking"; + + /** The Constant DESC_LEADERS_SCOREBOARD. */ + String DESC_LEADERS_SCOREBOARD = "Leaders: comparing party leadership impact."; + + /** The Constant PART_LEADERS_SCOREBOARD. */ + String PART_LEADERS_SCOREBOARD = "Party leaders scoreboard"; + + /** The Constant COMMITTEE_RANKING_LINK_TEXT. */ + String COMMITTEE_RANKING_LINK_TEXT = COMMITTEE_RANKING_TEXT; + + /** The Constant COMMITTEES_LINK_TEXT. */ + String COMMITTEES_LINK_TEXT = "Committees"; + + /** The Constant COUNTRY_RANKING_LINK_TEXT. */ + String COUNTRY_RANKING_LINK_TEXT = "Country Ranking"; + + /** The Constant DOCUMENTS. */ + String DOCUMENTS = "Documents"; + + /** The Constant GOVERNMENT_BODIES. */ + String GOVERNMENT_BODIES = "Government bodies"; + + /** The Constant GOVERNMENT_BODY_RANKING. */ + String GOVERNMENT_BODY_RANKING = "Government body Ranking"; + + /** The Constant MINISTRIES_LINK_TEXT. */ + String MINISTRIES_LINK_TEXT = "Ministries"; + + /** The Constant MINISTRY_RANKING. */ + String MINISTRY_RANKING = "Ministry Ranking"; + + /** The Constant MINISTRY_RANKING_LINK_TEXT. */ + String MINISTRY_RANKING_LINK_TEXT = MINISTRY_RANKING; + + /** The Constant PARLIAMENT_RANKING_LINK_TEXT. */ + String PARLIAMENT_RANKING_LINK_TEXT = "Parliament Ranking"; + + /** The Constant PARTIES_LINK_TEXT. */ + String PARTIES_LINK_TEXT = "Parties"; + + /** The Constant PARTY_RANKING. */ + String PARTY_RANKING = "Party Ranking"; + + /** The Constant PARTY_RANKING_LINK_TEXT. */ + String PARTY_RANKING_LINK_TEXT = PARTY_RANKING; + + /** The Constant POLITICIAN_RANKING. */ + String POLITICIAN_RANKING = "Politician Ranking"; + + /** The Constant POLITICIAN_RANKING_LINK_TEXT. */ + String POLITICIAN_RANKING_LINK_TEXT = POLITICIAN_RANKING; + + /** The Constant POLITICIANS_LINK_TEXT. */ + String POLITICIANS_LINK_TEXT = "Politicians"; + + /** The Constant SEARCH_DOCUMENTS. */ + String SEARCH_DOCUMENTS = "Search documents"; + + /** The Constant SEARCH_DOCUMENTS_DESCRIPTION. */ + String SEARCH_DOCUMENTS_DESCRIPTION = "Search documents: legislative records."; + + /** The Constant COUNTRY_RANKING_DESCRIPTION. */ + String COUNTRY_RANKING_DESCRIPTION = "Sweden’s governance: key indicators."; + + /** The Constant MINISTRIES_LEADER_SCOREBOARD. */ + String MINISTRIES_LEADER_SCOREBOARD = "Government Ministers Scoreboard"; + + /** The Constant MINISTRIES_LEADER_SCOREBOARD_DESCRIPTION. */ + String MINISTRIES_LEADER_SCOREBOARD_DESCRIPTION = "Cabinet leaders: power and institutional impact."; + + /** The Constant MINISTRY_RANKING_DESCRIPTION. */ + String MINISTRY_RANKING_DESCRIPTION = "Ministry influence on policy."; + + /** The Constant MINISTRIES_DESCRIPTION. */ + String MINISTRIES_DESCRIPTION = "All ministries: roles and commitments."; + + /** The Constant GOVERNMENT_BODY_RANKING_DESCRIPTION. */ + String GOVERNMENT_BODY_RANKING_DESCRIPTION = "Government bodies: performance snapshots."; + + /** The Constant GOVERNMENT_BODIES_DESCRIPTION. */ + String GOVERNMENT_BODIES_DESCRIPTION = "All bodies: structure and influence."; + + /** The Constant PARLIAMENT_RANKING_DESCRIPTION. */ + String PARLIAMENT_RANKING_DESCRIPTION = "Parliament: legislative effectiveness."; + + /** The Constant COMMITTEE_RANKING_DESCRIPTION. */ + String COMMITTEE_RANKING_DESCRIPTION = "Committees: shaping policy debates."; + + /** The Constant COMMITTEES_DESCRIPTION. */ + String COMMITTEES_DESCRIPTION = "All committees: roles and responsibilities."; + + /** The Constant PARTY_RANKING_DESCRIPTION. */ + String PARTY_RANKING_DESCRIPTION = "Parties: influence on agenda."; + + /** The Constant PARTIES_DESCRIPTION. */ + String PARTIES_DESCRIPTION = "All parties: leadership and policy roles."; + + /** The Constant POLITICIAN_RANKING_DESCRIPTION. */ + String POLITICIAN_RANKING_DESCRIPTION = "Politicians: individual impact."; + + /** The Constant POLITICIANS_DESCRIPTION. */ + String POLITICIANS_DESCRIPTION = "All politicians: service and contributions."; + + /** The Constant DOCUMENTS_DESCRIPTION. */ + String DOCUMENTS_DESCRIPTION = "All documents: official records."; + + /** The Constant HEADCOUNT. */ + String HEADCOUNT = "Headcount"; + + /** The Constant GOVERNMENT_OUTCOME. */ + String GOVERNMENT_OUTCOME = "Government Outcome"; + + /** The Constant GOVERNMENT_OUTCOME_DESCRIPTION. */ + String GOVERNMENT_OUTCOME_DESCRIPTION = "Government outcome description"; + + /** The Constant GOVERNMENT_ROLES_CHART. */ + String GOVERNMENT_ROLES_CHART = "Government Roles Chart"; + + /** The Constant GOVERNMENT_ROLES_CHART_DESCRIPTION. */ + String GOVERNMENT_ROLES_CHART_DESCRIPTION = "Government roles chart description"; + + /** The Constant CURRENT_MINISTRIES_CURRENT_MEMBERS_TEXT. */ + String CURRENT_MINISTRIES_CURRENT_MEMBERS_TEXT = "Current Ministries, Current Members"; + + /** The Constant CURRENT_PARTIES_ACTIVE_IN_MINISTRIES_CURRENT_ASSIGNMENTS. */ + String CURRENT_PARTIES_ACTIVE_IN_MINISTRIES_CURRENT_ASSIGNMENTS = "Current Parties Active in Ministries, Current Assignments"; + + /** The Constant ALL_PARTIES_TOTAL_DAYS_SERVED_IN_MINISTRIES. */ + String ALL_PARTIES_TOTAL_DAYS_SERVED_IN_MINISTRIES = "All Parties, Total Days Served in Ministries"; + + /** The Constant ALL_MINISTRIES_TOTAL_MEMBERS. */ + String ALL_MINISTRIES_TOTAL_MEMBERS = "All Ministries, Total Members"; + + /** The Constant PARTY_WINNER. */ + String PARTY_WINNER = "Party Winner"; + + /** The Constant PARTY_WINNER_DESCRIPTION. */ + String PARTY_WINNER_DESCRIPTION = "Party winner description"; + + /** The Constant PARTY_GENDER. */ + String PARTY_GENDER = "Party Gender"; + + /** The Constant PARTY_GENDER_DESCRIPTION. */ + String PARTY_GENDER_DESCRIPTION = "Party gender description"; + + /** The Constant PARTY_AGE. */ + String PARTY_AGE = "Party Age"; + + /** The Constant PARTY_AGE_DESCRIPTION. */ + String PARTY_AGE_DESCRIPTION = "Party age description"; + + /** The Constant RISK_SUMMARY. */ + String RISK_SUMMARY = "Risk Summary"; + + /** The Constant RISK_SUMMARY_DESCRIPTION. */ + String RISK_SUMMARY_DESCRIPTION = "Risk summary description"; + + /** The Constant RULE_VIOLATIONS. */ + String RULE_VIOLATIONS = "Rule Violations"; + + /** The Constant RULE_VIOLATIONS_DESCRIPTION. */ + String RULE_VIOLATIONS_DESCRIPTION = "Rule violations description"; + + /** The Constant DOCUMENT_ACTIVITY_BY_TYPE. */ + String DOCUMENT_ACTIVITY_BY_TYPE = "Document Activity by Type"; + + /** The Constant DECISION_ACTIVITY_BY_TYPE. */ + String DECISION_ACTIVITY_BY_TYPE = "Decision Activity by Type"; + + /** The Constant DECISION_ACTIVITY_DESCRIPTION. */ + String DECISION_ACTIVITY_DESCRIPTION = "Decision activity description"; + + /** The Constant DECISION_FLOW. */ + String DECISION_FLOW = "Decision Flow"; + + /** The Constant PARLIAMENT_RANKING_TEXT. */ + String PARLIAMENT_RANKING_TEXT = "Parliament Ranking"; + + /** The Constant SWEDISH_PARLIAMENT_INDICATORS. */ + String SWEDISH_PARLIAMENT_INDICATORS = "Swedish Parliament Indicators"; + + /** The Constant CURRENT_LEADERS. */ + String CURRENT_LEADERS = "Current Leaders"; + + /** The Constant CURRENT_LEADERS_DESCRIPTION. */ + String CURRENT_LEADERS_DESCRIPTION = "Current leaders description"; + + /** The Constant LEADER_HISTORY. */ + String LEADER_HISTORY = "Leader History"; + + /** The Constant LEADER_HISTORY_DESCRIPTION. */ + String LEADER_HISTORY_DESCRIPTION = "Leader history description"; + + /** The Constant GOVERMENT_ROLES. */ + String GOVERMENT_ROLES = "Government Roles"; + + /** The Constant GOVERMENT_ROLES_DESCRIPTION. */ + String GOVERMENT_ROLES_DESCRIPTION = "Government roles description"; + + /** The Constant COMMITTEE_ROLES. */ + String COMMITTEE_ROLES = "Committee Roles"; + + /** The Constant COMMITTEE_ROLES_DESCRIPTION. */ + String COMMITTEE_ROLES_DESCRIPTION = "Committee roles description"; + +} \ No newline at end of file diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemCountryConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemCountryConstants.java new file mode 100644 index 0000000000..d2a3a4ea8d --- /dev/null +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemCountryConstants.java @@ -0,0 +1,28 @@ +package com.hack23.cia.web.impl.ui.application.views.common.menufactory.api; + +/** + * The Interface MenuItemCountryConstants. + */ +public interface MenuItemCountryConstants { + + /** The country. */ + String COUNTRY = "Country"; + + /** The country ranking text. */ + String COUNTRY_RANKING_TEXT = "Country Ranking"; + + /** The country overview text. */ + String COUNTRY_OVERVIEW_TEXT = "Country Overview"; + + /** The country indicators sweden. */ + String COUNTRY_INDICATORS_SWEDEN = "Country Indicators Sweden"; + + /** The country ranking link text. */ + String COUNTRY_RANKING_LINK_TEXT = "Country Ranking"; + + /** The country ranking description. */ + String COUNTRY_RANKING_DESCRIPTION = "Sweden's governance: key indicators."; + + /** The sweden dashboard. */ + String SWEDEN_DASHBOARD = "Sweden Dashboard"; +} diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemDataConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemDataConstants.java new file mode 100644 index 0000000000..a3245bdb9e --- /dev/null +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemDataConstants.java @@ -0,0 +1,13 @@ +package com.hack23.cia.web.impl.ui.application.views.common.menufactory.api; + +/** + * The Interface MenuItemDataConstants. + */ +public interface MenuItemDataConstants { + + /** The data points for year above. */ + int DATA_POINTS_FOR_YEAR_ABOVE = 2000; + + /** The minimum number data points. */ + int MINIMUM_NUMBER_DATA_POINTS = 10; +} diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemDecisionConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemDecisionConstants.java new file mode 100644 index 0000000000..7ba605b4be --- /dev/null +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemDecisionConstants.java @@ -0,0 +1,34 @@ +package com.hack23.cia.web.impl.ui.application.views.common.menufactory.api; + +/** + * The Interface MenuItemDecisionConstants. + */ +public interface MenuItemDecisionConstants { + + /** The decision flow. */ + String DECISION_FLOW = "Decision Flow"; + + /** The decision activity by type. */ + String DECISION_ACTIVITY_BY_TYPE = "Decision Activity by Type"; + + /** The decision activity description. */ + String DECISION_ACTIVITY_DESCRIPTION = "Decision activity description"; + + /** The decision flow description. */ + String DECISION_FLOW_DESCRIPTION = "Decision flow description"; + + /** The decision summary text. */ + String DECISION_SUMMARY_TEXT = "Decision Summary"; + + /** The decision summary description. */ + String DECISION_SUMMARY_DESCRIPTION = "Decision summary description"; + + /** The decision type daily summary text. */ + String DECISION_TYPE_DAILY_SUMMARY_TEXT = "Decision Type Daily Summary"; + + /** The decision type daily summary description. */ + String DECISION_TYPE_DAILY_SUMMARY_DESCRIPTION = "Decision type daily summary description"; + + /** The ballot decision summary description. */ + String BALLOT_DECISION_SUMMARY_DESCRIPTION = "Ballot decision summary description"; +} diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemDocumentConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemDocumentConstants.java new file mode 100644 index 0000000000..a8cc34e168 --- /dev/null +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemDocumentConstants.java @@ -0,0 +1,41 @@ +package com.hack23.cia.web.impl.ui.application.views.common.menufactory.api; + +/** + * The Interface MenuItemDocumentConstants. + */ +public interface MenuItemDocumentConstants { + + /** The document. */ + String DOCUMENT = "Document"; + + /** The documents. */ + String DOCUMENTS = "Documents"; + + /** The document details. */ + String DOCUMENT_DETAILS = "Document Details"; + + /** The document data. */ + String DOCUMENT_DATA = "Document Data"; + + /** The document references. */ + String DOCUMENT_REFERENCES = "Document References"; + + /** The document decision. */ + String DOCUMENT_DECISION = "Document Decision"; + + /** The document attachements. */ + String DOCUMENT_ATTACHEMENTS = "Document Attachments"; + + /** The document overview text. */ + String DOCUMENT_OVERVIEW_TEXT = "Document Overview"; + + /** The document activity text. */ + String DOCUMENT_ACTIVITY_TEXT = "Document Activity"; + + /** The document history text. */ + String DOCUMENT_HISTORY_TEXT = "Document History"; + + /** The documents description. */ + String DOCUMENTS_DESCRIPTION = "All documents: official records."; + // ...add other document-related constants... +} diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemGovernmentConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemGovernmentConstants.java new file mode 100644 index 0000000000..3c2605887e --- /dev/null +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemGovernmentConstants.java @@ -0,0 +1,35 @@ +package com.hack23.cia.web.impl.ui.application.views.common.menufactory.api; + +/** + * The Interface MenuItemGovernmentConstants. + */ +public interface MenuItemGovernmentConstants { + + /** The government body ranking. */ + String GOVERNMENT_BODY_RANKING = "Government body Ranking"; + + /** The government bodies. */ + String GOVERNMENT_BODIES = "Government bodies"; + + /** The government outcome. */ + String GOVERNMENT_OUTCOME = "Government Outcome"; + + /** The government roles chart. */ + String GOVERNMENT_ROLES_CHART = "Government Roles Chart"; + + /** The government body overview text. */ + String GOVERNMENT_BODY_OVERVIEW_TEXT = "Government Body Overview"; + + /** The government body ranking description. */ + String GOVERNMENT_BODY_RANKING_DESCRIPTION = "Government bodies: performance snapshots."; + + /** The government bodies description. */ + String GOVERNMENT_BODIES_DESCRIPTION = "All bodies: structure and influence."; + + /** The government outcome description. */ + String GOVERNMENT_OUTCOME_DESCRIPTION = "Government outcome description"; + + /** The government roles chart description. */ + String GOVERNMENT_ROLES_CHART_DESCRIPTION = "Government roles chart description"; + // ...add other government-related constants... +} diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemLayoutConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemLayoutConstants.java new file mode 100644 index 0000000000..581dc6a79b --- /dev/null +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemLayoutConstants.java @@ -0,0 +1,30 @@ +package com.hack23.cia.web.impl.ui.application.views.common.menufactory.api; + +/** + * The Interface MenuItemLayoutConstants. + */ +public interface MenuItemLayoutConstants { + + /** The display size lg device. */ + int DISPLAY_SIZE_LG_DEVICE = 4; + + /** The display size md device. */ + int DISPLAY_SIZE_MD_DEVICE = 4; + + /** The display size xs device. */ + int DISPLAY_SIZE_XS_DEVICE = 12; + + /** The displays size xm device. */ + int DISPLAYS_SIZE_XM_DEVICE = 6; + + /** The menu bar width. */ + String MENU_BAR_WIDTH = "80%"; + + /** The header style name. */ + String HEADER_STYLE_NAME = "Header"; + + /** The link style name. */ + String LINK_STYLE_NAME = "link"; + + +} diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemLeadershipConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemLeadershipConstants.java new file mode 100644 index 0000000000..39222bc94a --- /dev/null +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemLeadershipConstants.java @@ -0,0 +1,25 @@ +package com.hack23.cia.web.impl.ui.application.views.common.menufactory.api; + +/** + * The Interface MenuItemLeadershipConstants. + */ +public interface MenuItemLeadershipConstants { + + /** The current leaders. */ + String CURRENT_LEADERS = "Current Leaders"; + + /** The current leaders description. */ + String CURRENT_LEADERS_DESCRIPTION = "Current leaders description"; + + /** The leader history. */ + String LEADER_HISTORY = "Leader History"; + + /** The leader history description. */ + String LEADER_HISTORY_DESCRIPTION = "Leader history description"; + + /** The desc leaders scoreboard. */ + String DESC_LEADERS_SCOREBOARD = "Leaders: comparing party leadership impact."; + + /** The part leaders scoreboard. */ + String PART_LEADERS_SCOREBOARD = "Party leaders scoreboard"; +} diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemMinistryConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemMinistryConstants.java new file mode 100644 index 0000000000..28dc5df792 --- /dev/null +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemMinistryConstants.java @@ -0,0 +1,40 @@ +package com.hack23.cia.web.impl.ui.application.views.common.menufactory.api; + +/** + * The Interface MenuItemMinistryConstants. + */ +public interface MenuItemMinistryConstants { + + /** The ministries link text. */ + String MINISTRIES_LINK_TEXT = "Ministries"; + + /** The ministry ranking. */ + String MINISTRY_RANKING = "Ministry Ranking"; + + /** The ministry ranking link text. */ + String MINISTRY_RANKING_LINK_TEXT = MINISTRY_RANKING; + + /** The ministry ranking description. */ + String MINISTRY_RANKING_DESCRIPTION = "Ministry influence on policy."; + + /** The ministries description. */ + String MINISTRIES_DESCRIPTION = "All ministries: roles and commitments."; + + /** The ministry document activity text. */ + String MINISTRY_DOCUMENT_ACTIVITY_TEXT = "Document Activity"; + + /** The ministry overview text. */ + String MINISTRY_OVERVIEW_TEXT = "Overview"; + + /** The ministries leader scoreboard. */ + String MINISTRIES_LEADER_SCOREBOARD = "Government Ministers Scoreboard"; + + /** The ministries leader scoreboard description. */ + String MINISTRIES_LEADER_SCOREBOARD_DESCRIPTION = "Cabinet leaders: power and institutional impact."; + + /** The current ministries current members text. */ + String CURRENT_MINISTRIES_CURRENT_MEMBERS_TEXT = "Current Ministries, Current Members"; + + /** The all ministries total members. */ + String ALL_MINISTRIES_TOTAL_MEMBERS = "All Ministries, Total Members"; +} diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemNavigationConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemNavigationConstants.java new file mode 100644 index 0000000000..29920bf56a --- /dev/null +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemNavigationConstants.java @@ -0,0 +1,44 @@ +package com.hack23.cia.web.impl.ui.application.views.common.menufactory.api; + +/** + * Core navigation constants. + */ +public interface MenuItemNavigationConstants { + + /** The dashboard. */ + String DASHBOARD = "Dashboard"; + + /** The main. */ + String MAIN = "Main"; + + /** The start text. */ + String START_TEXT = "Start"; + + /** The overview text. */ + String OVERVIEW_TEXT = "Overview"; + + /** The ranking text. */ + String RANKING_TEXT = "Ranking"; + + /** The by topic. */ + String BY_TOPIC = "By Topic"; + + /** The list all. */ + String LIST_ALL = "List All"; + + /** The login. */ + // Security related + String LOGIN = "Login"; + + /** The logout. */ + String LOGOUT = "Logout"; + + /** The register. */ + String REGISTER = "Register"; + + /** The role admin. */ + String ROLE_ADMIN = "ROLE_ADMIN"; + + /** The role user. */ + String ROLE_USER = "ROLE_USER"; +} diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemPageVisitConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemPageVisitConstants.java new file mode 100644 index 0000000000..79a7fd73a6 --- /dev/null +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemPageVisitConstants.java @@ -0,0 +1,36 @@ +package com.hack23.cia.web.impl.ui.application.views.common.menufactory.api; + +/** + * Constants for page visit history related menu items. + */ +public interface MenuItemPageVisitConstants { + + /** The page visit history text. */ + String PAGE_VISIT_HISTORY_TEXT = "Page Visit History"; + + /** The desc page visit history. */ + String DESC_PAGE_VISIT_HISTORY = "Visit history: tracking public engagement patterns."; + + /** The ministry page visit history text. */ + // Ministry related + String MINISTRY_PAGE_VISIT_HISTORY_TEXT = "Page Visit History"; + + /** The ministry page visit history description. */ + String MINISTRY_PAGE_VISIT_HISTORY_DESCRIPTION = "View history of page visit for this page."; + + /** The document page visit history text. */ + // Document related + String DOCUMENT_PAGE_VISIT_HISTORY_TEXT = "Document Page Visit History"; + + /** The country page visit history text. */ + // Country related + String COUNTRY_PAGE_VISIT_HISTORY_TEXT = "Country Page Visit History"; + + + /** The government body page visit history text. */ + // Government Body related + String GOVERNMENT_BODY_PAGE_VISIT_HISTORY_TEXT = "Government Body Page Visit History"; + + /** The government body page visit history description. */ + String GOVERNMENT_BODY_PAGE_VISIT_HISTORY_DESCRIPTION = "Government body page visit history description"; +} \ No newline at end of file diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemParliamentConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemParliamentConstants.java new file mode 100644 index 0000000000..26fc091c81 --- /dev/null +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemParliamentConstants.java @@ -0,0 +1,59 @@ +package com.hack23.cia.web.impl.ui.application.views.common.menufactory.api; + +/** + * The Interface MenuItemParliamentConstants. + */ +public interface MenuItemParliamentConstants { + + /** The parliament ranking text. */ + String PARLIAMENT_RANKING_TEXT = "Parliament Ranking"; + + /** The parliament ranking link text. */ + String PARLIAMENT_RANKING_LINK_TEXT = "Parliament Ranking"; + + /** The parliament ranking description. */ + String PARLIAMENT_RANKING_DESCRIPTION = "Parliament: legislative effectiveness."; + + /** The swedish parliament indicators. */ + String SWEDISH_PARLIAMENT_INDICATORS = "Swedish Parliament Indicators"; + + /** The ministry document activity text. */ + String MINISTRY_DOCUMENT_ACTIVITY_TEXT = "Document Activity"; + + /** The ministry overview text. */ + String MINISTRY_OVERVIEW_TEXT = "Overview"; + + /** The all parties total days served in parliament. */ + // Label constants + String ALL_PARTIES_TOTAL_DAYS_SERVED_IN_PARLIAMENT = "All parties total days served in parliament"; + + /** The current parties active in committees head count. */ + String CURRENT_PARTIES_ACTIVE_IN_COMMITTEES_HEAD_COUNT = "Current parties in committees"; + + /** The current parties active in ministries head count text. */ + String CURRENT_PARTIES_ACTIVE_IN_MINISTRIES_HEAD_COUNT_TEXT = "Current parties in government"; + + /** The current parties active in parliament head count. */ + String CURRENT_PARTIES_ACTIVE_IN_PARLIAMENT_HEAD_COUNT = "Current parties in parliament"; + + /** The party by total members based on roles in departments committees and parliament. */ + String PARTY_BY_TOTAL_MEMBERS_BASED_ON_ROLES_IN_DEPARTMENTS_COMMITTEES_AND_PARLIAMENT = "Party by total members across EU/gov/committees/parliament"; + + /** The desc all parties roles. */ + // Political analyst perspective descriptions (~50 chars) + String DESC_ALL_PARTIES_ROLES = "All parties: influence across key institutions."; + + /** The desc government headcount. */ + String DESC_GOVERNMENT_HEADCOUNT = "Governing parties: evaluating institutional strength."; + + /** The desc committees headcount. */ + String DESC_COMMITTEES_HEADCOUNT = "Committees: parties' agenda-setting influence."; + + /** The desc parliament headcount. */ + String DESC_PARLIAMENT_HEADCOUNT = "Parliament: mapping party legislative leverage."; + + /** The desc days served parliament. */ + String DESC_DAYS_SERVED_PARLIAMENT = "All parties: experience shaping policy timelines."; + + +} diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemPartyConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemPartyConstants.java new file mode 100644 index 0000000000..109bd16baf --- /dev/null +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemPartyConstants.java @@ -0,0 +1,55 @@ +package com.hack23.cia.web.impl.ui.application.views.common.menufactory.api; + +/** + * The Interface MenuItemPartyConstants. + */ +public interface MenuItemPartyConstants { + + /** The party won daily summary chart. */ + String PARTY_WON_DAILY_SUMMARY_CHART = "Party Won Daily Summary Chart"; + + /** The party winner. */ + String PARTY_WINNER = "Party Winner"; + + /** The party gender. */ + String PARTY_GENDER = "Party Gender"; + + /** The party age. */ + String PARTY_AGE = "Party Age"; + + /** The party ranking. */ + String PARTY_RANKING = "Party Ranking"; + + /** The party ranking link text. */ + String PARTY_RANKING_LINK_TEXT = PARTY_RANKING; + + /** The parties link text. */ + String PARTIES_LINK_TEXT = "Parties"; + + /** The party ranking description. */ + String PARTY_RANKING_DESCRIPTION = "Parties: influence on agenda."; + + /** The parties description. */ + String PARTIES_DESCRIPTION = "All parties: leadership and policy roles."; + // String constants + + + /** The Constant ROLE_CHART_PARTY_LEADERS. */ + String ROLE_CHART_PARTY_LEADERS = "Role chart, party leaders"; + + /** The Constant VOTE_HISTORY. */ + String VOTE_HISTORY = "Vote history"; + + /** The Constant ROLE_CHART_PARTY_LEADERS_DESCRIPTION. */ + String ROLE_CHART_PARTY_LEADERS_DESCRIPTION = "Gantt chart all party leaders"; + + /** The Constant PARTY_WON_DAILY_SUMMARY_CHART_DESCRIPTION. */ + String PARTY_WON_DAILY_SUMMARY_CHART_DESCRIPTION = "Chart for Party over won,absent and party rebel votes"; + + /** The Constant PARTY_AGAINST_COALATIONS_SUMMARY_DESCRIPTION. */ + String PARTY_AGAINST_COALATIONS_SUMMARY_DESCRIPTION = "Coalations with groups of diffrent parties aginst committe proposals ballots"; + + /** The Constant PARTY_SUPPORT_SUMMARY_DESCRIPTION. */ + String PARTY_SUPPORT_SUMMARY_DESCRIPTION = "Trend of agreements with other parties during ballots"; + +} diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemPoliticianConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemPoliticianConstants.java new file mode 100644 index 0000000000..f1992759dd --- /dev/null +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemPoliticianConstants.java @@ -0,0 +1,43 @@ +package com.hack23.cia.web.impl.ui.application.views.common.menufactory.api; + +/** + * Constants related to politicians in the menu system. + */ +public interface MenuItemPoliticianConstants { + + /** The politician ranking. */ + String POLITICIAN_RANKING = "Politician Ranking"; + + /** The politician ranking link text. */ + String POLITICIAN_RANKING_LINK_TEXT = POLITICIAN_RANKING; + + /** The politicians link text. */ + String POLITICIANS_LINK_TEXT = "Politicians"; + + /** The politician ranking description. */ + String POLITICIAN_RANKING_DESCRIPTION = "Politicians: individual impact."; + + /** The politicians description. */ + String POLITICIANS_DESCRIPTION = "All politicians: service and contributions."; + + /** The current members text. */ + String CURRENT_MEMBERS_TEXT = "Current Members"; + + /** The member history text. */ + String MEMBER_HISTORY_TEXT = "Member History"; + + /** The current members description. */ + String CURRENT_MEMBERS_DESCRIPTION = "Current members description"; + + /** The member history description. */ + String MEMBER_HISTORY_DESCRIPTION = "Member history description"; + + /** The roles text. */ + String ROLES_TEXT = "Roles"; + + /** The role ghant text. */ + String ROLE_GHANT_TEXT = "Role Ghant"; + + /** The role ghant description. */ + String ROLE_GHANT_DESCRIPTION = "Role ghant description"; +} diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemRiskConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemRiskConstants.java new file mode 100644 index 0000000000..ec7b00ea61 --- /dev/null +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemRiskConstants.java @@ -0,0 +1,19 @@ +package com.hack23.cia.web.impl.ui.application.views.common.menufactory.api; + +/** + * The Interface MenuItemRiskConstants. + */ +public interface MenuItemRiskConstants { + + /** The risk summary. */ + String RISK_SUMMARY = "Risk Summary"; + + /** The risk summary description. */ + String RISK_SUMMARY_DESCRIPTION = "Risk summary description"; + + /** The rule violations. */ + String RULE_VIOLATIONS = "Rule Violations"; + + /** The rule violations description. */ + String RULE_VIOLATIONS_DESCRIPTION = "Rule violations description"; +} diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemStatisticsConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemStatisticsConstants.java new file mode 100644 index 0000000000..f814f9357f --- /dev/null +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemStatisticsConstants.java @@ -0,0 +1,31 @@ +package com.hack23.cia.web.impl.ui.application.views.common.menufactory.api; + +/** + * The Interface MenuItemStatisticsConstants. + */ +public interface MenuItemStatisticsConstants { + + /** The headcount. */ + String HEADCOUNT = "Headcount"; + + /** The headcount chart. */ + String HEADCOUNT_CHART = "Headcount Chart"; + + /** The headcount description. */ + String HEADCOUNT_DESCRIPTION = "Headcount description"; + + /** The income. */ + String INCOME = "Income"; + + /** The income description. */ + String INCOME_DESCRIPTION = "Income description"; + + /** The expenditure. */ + String EXPENDITURE = "Expenditure"; + + /** The expenditure description. */ + String EXPENDITURE_DESCRIPTION = "Expenditure description"; + + /** The total members. */ + String TOTAL_MEMBERS = "Total members"; +} diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemUserConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemUserConstants.java new file mode 100644 index 0000000000..7fc3fd3c75 --- /dev/null +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/MenuItemUserConstants.java @@ -0,0 +1,49 @@ +package com.hack23.cia.web.impl.ui.application.views.common.menufactory.api; + +/** + * The Interface MenuItemUserConstants. + */ +public interface MenuItemUserConstants { + + /** The user home. */ + String USER_HOME = "User Home"; + + /** The user profile. */ + String USER_PROFILE = "User Profile"; + + /** The user settings. */ + String USER_SETTINGS = "User Settings"; + + /** The user logout. */ + String USER_LOGOUT = "User Logout"; + + /** The user home description. */ + String USER_HOME_DESCRIPTION = "Navigate to user home page"; + + /** The user profile description. */ + String USER_PROFILE_DESCRIPTION = "View and edit user profile"; + + /** The user settings description. */ + String USER_SETTINGS_DESCRIPTION = "Adjust user settings"; + + /** The user logout description. */ + String USER_LOGOUT_DESCRIPTION = "Logout from the application"; + + /** The user visits. */ + String USER_VISITS = "User Visits"; + + /** The user events. */ + String USER_EVENTS = "User Events"; + + /** The user visits description. */ + String USER_VISITS_DESCRIPTION = "View user visit history"; + + /** The user events description. */ + String USER_EVENTS_DESCRIPTION = "View user event history"; + + /** The useraccount. */ + String USERACCOUNT = "Useraccount"; + + /** The userhome. */ + String USERHOME = "Userhome"; +} diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/PageCommandAdminConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/PageCommandAdminConstants.java new file mode 100644 index 0000000000..b713ab793d --- /dev/null +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/PageCommandAdminConstants.java @@ -0,0 +1,73 @@ +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.AdminViews; +import com.hack23.cia.web.impl.ui.application.views.common.viewnames.DataSummaryPageMode; +import com.hack23.cia.web.impl.ui.application.views.common.viewnames.PageMode; + + +/** + * The Interface MenuItemConstants. + */ +public interface PageCommandAdminConstants extends MenuItemConstants { + + + /** The Constant COMMAND_AGENCY. */ + PageModeMenuCommand COMMAND_AGENCY = new PageModeMenuCommand(AdminViews.ADMIN_AGENCY_VIEW_NAME, ""); + + /** The Constant COMMAND_AGENT_OPERATION. */ + PageModeMenuCommand COMMAND_AGENT_OPERATION = new PageModeMenuCommand( + AdminViews.ADMIN_AGENT_OPERATIONVIEW_NAME, ""); + + /** The Constant COMMAND_APPLICATION_CONFIGURATION. */ + PageModeMenuCommand COMMAND_APPLICATION_CONFIGURATION = new PageModeMenuCommand( + AdminViews.ADMIN_APPLICATIONS_CONFIGURATION_VIEW_NAME, ""); + + /** The Constant COMMAND_APPLICATION_EVENTS. */ + PageModeMenuCommand COMMAND_APPLICATION_EVENTS = new PageModeMenuCommand( + AdminViews.ADMIN_APPLICATIONS_EVENTS_VIEW_NAME, ""); + + /** The Constant COMMAND_APPLICATION_EVENTS_CHARTS. */ + PageModeMenuCommand COMMAND_APPLICATION_EVENTS_CHARTS = new PageModeMenuCommand( + AdminViews.ADMIN_APPLICATIONS_EVENTS_VIEW_NAME, PageMode.CHARTS); + + /** The Constant COMMAND_APPLICATION_SESSION. */ + PageModeMenuCommand COMMAND_APPLICATION_SESSION = new PageModeMenuCommand( + AdminViews.ADMIN_APPLICATIONS_SESSION_VIEW_NAME, ""); + + /** The Constant COMMAND_APPLICATION_SESSION_CHARTS. */ + PageModeMenuCommand COMMAND_APPLICATION_SESSION_CHARTS = new PageModeMenuCommand( + AdminViews.ADMIN_APPLICATIONS_SESSION_VIEW_NAME, PageMode.CHARTS); + + /** The Constant COMMAND_AUTHOR_DATASUMMARY. */ + PageModeMenuCommand COMMAND_AUTHOR_DATASUMMARY = new PageModeMenuCommand( + AdminViews.ADMIN_DATA_SUMMARY_VIEW_NAME, DataSummaryPageMode.AUTHORS.toString()); + + /** The Constant COMMAND_COUNTRY. */ + PageModeMenuCommand COMMAND_COUNTRY = new PageModeMenuCommand(AdminViews.ADMIN_COUNTRY_VIEW_NAME, ""); + + /** The Constant COMMAND_DATASUMMARY. */ + PageModeMenuCommand COMMAND_DATASUMMARY = new PageModeMenuCommand( + AdminViews.ADMIN_DATA_SUMMARY_VIEW_NAME, ""); + + /** The Constant COMMAND_EMAIL. */ + PageModeMenuCommand COMMAND_EMAIL = new PageModeMenuCommand(AdminViews.ADMIN_EMAIL_VIEW_NAME, + ""); + + /** The Constant COMMAND_LANGUAGE. */ + PageModeMenuCommand COMMAND_LANGUAGE = new PageModeMenuCommand(AdminViews.ADMIN_LANGUAGE_VIEW_NAME, + ""); + + + /** The Constant COMMAND_MONITORING. */ + PageModeMenuCommand COMMAND_MONITORING = new PageModeMenuCommand(AdminViews.ADMIN_MONITORING_VIEW_NAME, + ""); + + /** The Constant COMMAND_PORTAL. */ + PageModeMenuCommand COMMAND_PORTAL = new PageModeMenuCommand(AdminViews.ADMIN_PORTAL_VIEW_NAME, ""); + + /** The Constant COMMAND_USERACCOUNT. */ + PageModeMenuCommand COMMAND_USERACCOUNT = new PageModeMenuCommand(AdminViews.ADMIN_USERACCOUNT_VIEW_NAME, + ""); + +} \ No newline at end of file diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/PageCommandUserConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/PageCommandUserConstants.java new file mode 100644 index 0000000000..4a0b570033 --- /dev/null +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/PageCommandUserConstants.java @@ -0,0 +1,301 @@ +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.ChartIndicators; +import com.hack23.cia.web.impl.ui.application.views.common.viewnames.CommonsViews; +import com.hack23.cia.web.impl.ui.application.views.common.viewnames.GovernmentBodyPageMode; +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; + +/** + * The Interface MenuItemConstants. + */ +public interface PageCommandUserConstants extends PageCommandAdminConstants { + + /** The command charts all parties. */ + // Page mode commands + PageModeMenuCommand COMMAND_CHARTS_ALL_PARTIES = new PageModeMenuCommand( + UserViews.PARTY_RANKING_VIEW_NAME, PageMode.CHARTS, ChartIndicators.ALLPARTIES.toString()); + + /** The command charts current committees. */ + PageModeMenuCommand COMMAND_CHARTS_CURRENT_COMMITTEES = new PageModeMenuCommand( + UserViews.PARTY_RANKING_VIEW_NAME, PageMode.CHARTS, + ChartIndicators.CURRENTCOMMITTEES.toString()); + + /** The command charts current government parties. */ + PageModeMenuCommand COMMAND_CHARTS_CURRENT_GOVERNMENT_PARTIES = new PageModeMenuCommand( + UserViews.PARTY_RANKING_VIEW_NAME, PageMode.CHARTS, + ChartIndicators.CURRENTGOVERMENTPARTIES.toString()); + + /** The command charts current parties. */ + PageModeMenuCommand COMMAND_CHARTS_CURRENT_PARTIES = new PageModeMenuCommand( + UserViews.PARTY_RANKING_VIEW_NAME, PageMode.CHARTS, ChartIndicators.CURRENTPARTIES.toString()); + + /** + * Commands for different page modes within the Government Body Ranking view. + */ + PageModeMenuCommand GOVERNMENT_BODY_COMMAN_OVERVIEW = new PageModeMenuCommand( + UserViews.GOVERNMENT_BODY_RANKING_VIEW_NAME, + PageMode.OVERVIEW); + + /** The government body command datagrid. */ + PageModeMenuCommand GOVERNMENT_BODY_COMMAND_DATAGRID = new PageModeMenuCommand( + UserViews.GOVERNMENT_BODY_RANKING_VIEW_NAME, + PageMode.DATAGRID); + + /** The government body command expenditure. */ + PageModeMenuCommand GOVERNMENT_BODY_COMMAND_EXPENDITURE = new PageModeMenuCommand( + UserViews.GOVERNMENT_BODY_RANKING_VIEW_NAME, + GovernmentBodyPageMode.EXPENDITURE.toString()); + + /** The government body command headcount. */ + PageModeMenuCommand GOVERNMENT_BODY_COMMAND_HEADCOUNT = new PageModeMenuCommand( + UserViews.GOVERNMENT_BODY_RANKING_VIEW_NAME, + GovernmentBodyPageMode.HEADCOUNT.toString()); + + /** The government body command income. */ + PageModeMenuCommand GOVERNMENT_BODY_COMMAND_INCOME = new PageModeMenuCommand( + UserViews.GOVERNMENT_BODY_RANKING_VIEW_NAME, + GovernmentBodyPageMode.INCOME.toString()); + + /** The government body min command pagevisithistory. */ + PageModeMenuCommand GOVERNMENT_BODY_MIN_COMMAND_PAGEVISITHISTORY = new PageModeMenuCommand( + UserViews.GOVERNMENT_BODY_RANKING_VIEW_NAME, + PageMode.PAGEVISITHISTORY); + + /** The Constant COMMAND_GOVERNMENT_BODIES_EXPENDITURE. */ + PageModeMenuCommand GOVERNMENT_BODY_MIN_COMMAND_GOVERNMENT_BODIES_EXPENDITURE = new PageModeMenuCommand( + UserViews.MINISTRY_RANKING_VIEW_NAME, + MinistryPageMode.GOVERNMENT_BODIES_EXPENDITURE.toString()); + + /** The Constant COMMAND_GOVERNMENT_BODIES_HEADCOUNT. */ + PageModeMenuCommand GOVERNMENT_BODY_MIN_COMMAND_GOVERNMENT_BODIES_HEADCOUNT = new PageModeMenuCommand( + UserViews.MINISTRY_RANKING_VIEW_NAME, + MinistryPageMode.GOVERNMENT_BODIES_HEADCOUNT.toString()); + + /** The Constant COMMAND_GOVERNMENT_BODIES_INCOME. */ + PageModeMenuCommand GOVERNMENT_BODY__COMMAND_GOVERNMENT_BODIES_INCOME = new PageModeMenuCommand( + UserViews.MINISTRY_RANKING_VIEW_NAME, + MinistryPageMode.GOVERNMENT_BODIES_INCOME.toString()); + + + /** The Constant COMMAND_LOGIN. */ + PageModeMenuCommand COMMAND_LOGIN = new PageModeMenuCommand(CommonsViews.MAIN_VIEW_NAME, + ApplicationPageMode.LOGIN.toString()); + + /** The Constant COMMAND_LOGOUT. */ + PageModeMenuCommand COMMAND_LOGOUT = new PageModeMenuCommand(CommonsViews.MAIN_VIEW_NAME, + ApplicationPageMode.LOGOUT.toString()); + + /** The Constant COMMAND_MAINVIEW_OVERVIEW. */ + PageModeMenuCommand COMMAND_MAINVIEW_OVERVIEW = new PageModeMenuCommand(CommonsViews.MAIN_VIEW_NAME, + PageMode.OVERVIEW); + + /** The Constant COMMAND_DASHBOARDVIEW_OVERVIEW. */ + PageModeMenuCommand COMMAND_DASHBOARDVIEW_OVERVIEW = new PageModeMenuCommand(CommonsViews.DASHBOARD_VIEW_NAME, + PageMode.OVERVIEW); + + /** The Constant COMMAND_MAINVIEW_PAGEVISITHISTORY. */ + PageModeMenuCommand COMMAND_MAINVIEW_PAGEVISITHISTORY = new PageModeMenuCommand(CommonsViews.MAIN_VIEW_NAME, + PageMode.PAGEVISITHISTORY); + + + /** The Constant COMMAND_REGISTER. */ + PageModeMenuCommand COMMAND_REGISTER = new PageModeMenuCommand(CommonsViews.MAIN_VIEW_NAME, + ApplicationPageMode.REGISTER.toString()); + + + /** The Constant COMMAND_USERHOME. */ + PageModeMenuCommand COMMAND_USERHOME = new PageModeMenuCommand(UserViews.USERHOME_VIEW_NAME, ""); + + /** The Constant COMMAND_ALL_COMMITTEES_BY_HEADCOUNT. */ + PageModeMenuCommand COMMAND_ALL_COMMITTEES_BY_HEADCOUNT = new PageModeMenuCommand( + UserViews.COMMITTEE_RANKING_VIEW_NAME, + PageMode.CHARTS, ChartIndicators.ALLCOMMITTEESBYHEADCOUNT.toString()); + + /** The Constant COMMAND_COMMITTEES_BY_PARTY. */ + PageModeMenuCommand COMMAND_COMMITTEES_BY_PARTY = new PageModeMenuCommand(UserViews.COMMITTEE_RANKING_VIEW_NAME, + PageMode.CHARTS, ChartIndicators.COMMITTEESBYPARTY.toString()); + + /** The Constant COMMAND_CURRENT_COMMITTEES_BY_HEADCOUNT. */ + PageModeMenuCommand COMMAND_CURRENT_COMMITTEES_BY_HEADCOUNT = new PageModeMenuCommand( + UserViews.COMMITTEE_RANKING_VIEW_NAME, + PageMode.CHARTS, ChartIndicators.CURRENTCOMMITTEESBYHEADCOUNT.toString()); + + /** The Constant COMMAND_CURRENT_COMMITTEES_BY_PARTY_DAYS_SERVED. */ + PageModeMenuCommand COMMAND_CURRENT_COMMITTEES_BY_PARTY_DAYS_SERVED = new PageModeMenuCommand( + UserViews.COMMITTEE_RANKING_VIEW_NAME, + PageMode.CHARTS, ChartIndicators.CURRENTCOMMITTEESBYPARTYDAYSSERVED.toString()); + + /** The Constant COMMAND_DATAGRID. */ + PageModeMenuCommand COMMAND_DATAGRID = new PageModeMenuCommand(UserViews.COMMITTEE_RANKING_VIEW_NAME, + PageMode.DATAGRID); + + /** The Constant COMMAND_OVERVIEW. */ + PageModeMenuCommand COMMAND_OVERVIEW = new PageModeMenuCommand(UserViews.COMMITTEE_RANKING_VIEW_NAME, + PageMode.OVERVIEW); + + /** The Constant COMMAND_PAGEVISIT_HISTORY. */ + PageModeMenuCommand COMMAND_PAGEVISIT_HISTORY = new PageModeMenuCommand(UserViews.COMMITTEE_RANKING_VIEW_NAME, + PageMode.PAGEVISITHISTORY); + + /** The Constant COUNTRY_COMMAND_OVERVIEW. */ + PageModeMenuCommand COUNTRY_COMMAND_OVERVIEW = new PageModeMenuCommand(UserViews.COUNTRY_RANKING_VIEW_NAME, + PageMode.OVERVIEW); + + /** The Constant COUNTRY_COMMAND_PAGEVISITHISTORY. */ + PageModeMenuCommand COUNTRY_COMMAND_PAGEVISITHISTORY = new PageModeMenuCommand( + UserViews.COUNTRY_RANKING_VIEW_NAME, PageMode.PAGEVISITHISTORY); + + /** The Constant COMMAND_COMMITTEE_RANKING_DATAGRID. */ + PageModeMenuCommand COMMAND_COMMITTEE_RANKING_DATAGRID = new PageModeMenuCommand( + UserViews.COMMITTEE_RANKING_VIEW_NAME, PageMode.DATAGRID); + + /** The Constant COMMAND_COMMITTEE_RANKING_OVERVIEW. */ + PageModeMenuCommand COMMAND_COMMITTEE_RANKING_OVERVIEW = new PageModeMenuCommand( + UserViews.COMMITTEE_RANKING_VIEW_NAME, PageMode.OVERVIEW); + + /** The Constant COMMAND_COUNTRY_RANKING_OVERVIEW. */ + PageModeMenuCommand COMMAND_COUNTRY_RANKING_OVERVIEW = new PageModeMenuCommand( + UserViews.COUNTRY_RANKING_VIEW_NAME, PageMode.OVERVIEW); + + /** The Constant COMMAND_DOCUMENTS. */ + PageModeMenuCommand COMMAND_DOCUMENTS = new PageModeMenuCommand(UserViews.DOCUMENTS_VIEW_NAME, + PageMode.OVERVIEW); + + /** The Constant COMMAND_GOVERNMENT_BODY_RANKING_DATAGRID. */ + PageModeMenuCommand COMMAND_GOVERNMENT_BODY_RANKING_DATAGRID = new PageModeMenuCommand( + UserViews.GOVERNMENT_BODY_RANKING_VIEW_NAME, PageMode.DATAGRID); + + /** The Constant COMMAND_GOVERNMENT_BODY_RANKING_OVERVIEW. */ + PageModeMenuCommand COMMAND_GOVERNMENT_BODY_RANKING_OVERVIEW = new PageModeMenuCommand( + UserViews.GOVERNMENT_BODY_RANKING_VIEW_NAME, PageMode.OVERVIEW); + + /** The Constant COMMAND_MINISTRY_RANKING_DATAGRID. */ + PageModeMenuCommand COMMAND_MINISTRY_RANKING_DATAGRID = new PageModeMenuCommand( + UserViews.MINISTRY_RANKING_VIEW_NAME, PageMode.DATAGRID); + + /** The Constant COMMAND_MINISTRY_RANKING_OVERVIEW. */ + PageModeMenuCommand COMMAND_MINISTRY_RANKING_OVERVIEW = new PageModeMenuCommand( + UserViews.MINISTRY_RANKING_VIEW_NAME, PageMode.OVERVIEW); + + /** The Constant COMMAND_PARLIAMENT_RANKING_OVERVIEW. */ + PageModeMenuCommand COMMAND_PARLIAMENT_RANKING_OVERVIEW = new PageModeMenuCommand( + UserViews.PARLIAMENT_RANKING_VIEW_NAME, PageMode.OVERVIEW); + + /** The Constant COMMAND_PARTY_RANKING_DATAGRID. */ + PageModeMenuCommand COMMAND_PARTY_RANKING_DATAGRID = new PageModeMenuCommand(UserViews.PARTY_RANKING_VIEW_NAME, + PageMode.DATAGRID); + + /** The Constant COMMAND_PARTY_RANKING_OVERVIEW. */ + PageModeMenuCommand COMMAND_PARTY_RANKING_OVERVIEW = new PageModeMenuCommand(UserViews.PARTY_RANKING_VIEW_NAME, + PageMode.OVERVIEW); + + /** The Constant COMMAND_POLITICIAN_RANKING_DATAGRID. */ + PageModeMenuCommand COMMAND_POLITICIAN_RANKING_DATAGRID = new PageModeMenuCommand( + UserViews.POLITICIAN_RANKING_VIEW_NAME, PageMode.DATAGRID); + + /** The Constant COMMAND_POLITICIAN_RANKING_OVERVIEW. */ + PageModeMenuCommand COMMAND_POLITICIAN_RANKING_OVERVIEW = new PageModeMenuCommand( + UserViews.POLITICIAN_RANKING_VIEW_NAME, PageMode.OVERVIEW); + + /** The Constant COMMAND_SEARCH_DOCUMENT. */ + PageModeMenuCommand COMMAND_SEARCH_DOCUMENT = new PageModeMenuCommand(UserViews.SEARCH_DOCUMENT_VIEW_NAME, ""); + + /** The Constant COMMAND_CHARTS_CURRENT_MINISTRIES_LEADER_SCOREBOARD. */ + PageModeMenuCommand COMMAND_CHARTS_CURRENT_MINISTRIES_LEADER_SCOREBOARD = new PageModeMenuCommand( + UserViews.MINISTRY_RANKING_VIEW_NAME, + PageMode.CHARTS, ChartIndicators.CURRENTMINISTRIESLEADERSCORECARD.toString()); + + /** The Constant COMMAND_CHARTS_CURRENT_PARTIES_LEADER_SCOREBOARD. */ + PageModeMenuCommand COMMAND_CHARTS_CURRENT_PARTIES_LEADER_SCOREBOARD = new PageModeMenuCommand( + UserViews.PARTY_RANKING_VIEW_NAME, PageMode.CHARTS, + ChartIndicators.CURRENTPARTYLEADERSCORECARD.toString()); + + /** The Constant COMMAND_GOVERNMENT_BODIES_HEADCOUNT. */ + PageModeMenuCommand COMMAND_GOVERNMENT_BODIES_HEADCOUNT = new PageModeMenuCommand( + UserViews.GOVERNMENT_BODY_RANKING_VIEW_NAME, + PageMode.CHARTS, ChartIndicators.GOVERNMENTBODIESHEADCOUNT.toString()); + + /** The Constant COMMAND_GOVERNMENT_BODIES_INCOME. */ + PageModeMenuCommand COMMAND_GOVERNMENT_BODIES_INCOME = new PageModeMenuCommand( + UserViews.GOVERNMENT_BODY_RANKING_VIEW_NAME, + PageMode.CHARTS, ChartIndicators.GOVERNMENTBODIESINCOME.toString()); + + /** The Constant COMMAND_GOVERNMENT_BODIES_EXPENDITURE. */ + PageModeMenuCommand COMMAND_GOVERNMENT_BODIES_EXPENDITURE = new PageModeMenuCommand( + UserViews.GOVERNMENT_BODY_RANKING_VIEW_NAME, + PageMode.CHARTS, ChartIndicators.GOVERNMENTBODIESEXPENDITURE.toString()); + + /** The Constant COMMAND_GOVERNMENT_OUTCOME. */ + PageModeMenuCommand COMMAND_GOVERNMENT_OUTCOME = new PageModeMenuCommand( + UserViews.GOVERNMENT_BODY_RANKING_VIEW_NAME, + PageMode.CHARTS, ChartIndicators.GOVERNMENTOUTCOME.toString()); + + /** The Constant COMMAND_CHARTS_ALL_GOVERNMENT_ROLE_GANTT. */ + PageModeMenuCommand COMMAND_CHARTS_ALL_GOVERNMENT_ROLE_GANTT = new PageModeMenuCommand( + UserViews.GOVERNMENT_BODY_RANKING_VIEW_NAME, + PageMode.CHARTS, ChartIndicators.ALLGOVERNMENTROLEGANTT.toString()); + + /** The Constant COMMAND_CHARTS_CURRENT_MINISTRIES_BY_HEADCOUNT. */ + PageModeMenuCommand COMMAND_CHARTS_CURRENT_MINISTRIES_BY_HEADCOUNT = new PageModeMenuCommand( + UserViews.MINISTRY_RANKING_VIEW_NAME, + PageMode.CHARTS, ChartIndicators.CURRENTMINISTRIESBYHEADCOUNT.toString()); + + /** The Constant COMMAND_CHARTS_CURRENT_PARTIES_BY_HEADCOUNT. */ + PageModeMenuCommand COMMAND_CHARTS_CURRENT_PARTIES_BY_HEADCOUNT = new PageModeMenuCommand( + UserViews.MINISTRY_RANKING_VIEW_NAME, + PageMode.CHARTS, ChartIndicators.CURRENTPARTIESBYHEADCOUNT.toString()); + + /** The Constant COMMAND_CHARTS_ALLMINISTRIES_BY_TOTAL_DAYS. */ + PageModeMenuCommand COMMAND_CHARTS_ALLMINISTRIES_BY_TOTAL_DAYS = new PageModeMenuCommand( + UserViews.MINISTRY_RANKING_VIEW_NAME, + PageMode.CHARTS, ChartIndicators.ALLMINISTRIESBYTOTALDAYS.toString()); + + /** The Constant COMMAND_CHARTS_ALL_MINISTRIES_BY_HEADCOUNT. */ + PageModeMenuCommand COMMAND_CHARTS_ALL_MINISTRIES_BY_HEADCOUNT = new PageModeMenuCommand( + UserViews.MINISTRY_RANKING_VIEW_NAME, + PageMode.CHARTS, ChartIndicators.ALLMINISTRIESBYHEADCOUNT.toString()); + + /** The Constant COMMAND_PAGEVISITHISTORY. */ + PageModeMenuCommand COMMAND_PAGEVISITHISTORY = new PageModeMenuCommand(UserViews.MINISTRY_RANKING_VIEW_NAME, + PageMode.PAGEVISITHISTORY); + + /** The Constant COMMAND_CHARTS_PARTY_WINNER. */ + PageModeMenuCommand COMMAND_CHARTS_PARTY_WINNER = new PageModeMenuCommand( + UserViews.PARLIAMENT_RANKING_VIEW_NAME, + PageMode.CHARTS, ChartIndicators.PARTYWINNER.toString()); + + /** The Constant COMMAND_CHARTS_PARTY_GENDER. */ + PageModeMenuCommand COMMAND_CHARTS_PARTY_GENDER = new PageModeMenuCommand( + UserViews.PARLIAMENT_RANKING_VIEW_NAME, + PageMode.CHARTS, ChartIndicators.PARTYGENDER.toString()); + + /** The Constant COMMAND_CHARTS_PARTY_AGE. */ + PageModeMenuCommand COMMAND_CHARTS_PARTY_AGE = new PageModeMenuCommand(UserViews.PARLIAMENT_RANKING_VIEW_NAME, + PageMode.CHARTS, ChartIndicators.PARTYAGE.toString()); + + /** The Constant COMMAND_RISK_SUMMARY. */ + PageModeMenuCommand COMMAND_RISK_SUMMARY = new PageModeMenuCommand(UserViews.PARLIAMENT_RANKING_VIEW_NAME, + PageMode.CHARTS, ChartIndicators.RISKSUMMARY.toString()); + + /** The Constant COMMAND_RULE_VIOLATION. */ + PageModeMenuCommand COMMAND_RULE_VIOLATION = new PageModeMenuCommand(UserViews.PARLIAMENT_RANKING_VIEW_NAME, + PageMode.CHARTS, ChartIndicators.RULEVIOLATION.toString()); + + /** The Constant COMMAND_DOCUMENT_ACTIVITY. */ + PageModeMenuCommand COMMAND_DOCUMENT_ACTIVITY = new PageModeMenuCommand(UserViews.PARLIAMENT_RANKING_VIEW_NAME, + PageMode.CHARTS, ChartIndicators.DOCUMENTACTIVITY.toString()); + + /** The Constant COMMAND_DECISION_ACTIVITY. */ + PageModeMenuCommand COMMAND_DECISION_ACTIVITY = new PageModeMenuCommand(UserViews.PARLIAMENT_RANKING_VIEW_NAME, + PageMode.CHARTS, ChartIndicators.DECISIONACTIVITY.toString()); + + /** The Constant COMMAND_CHARTS_DECISION_FLOW. */ + PageModeMenuCommand COMMAND_CHARTS_DECISION_FLOW = new PageModeMenuCommand( + UserViews.PARLIAMENT_RANKING_VIEW_NAME, + PageMode.CHARTS, ChartIndicators.DECISIONFLOW.toString()); + +} \ No newline at end of file diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/AbstractMenuItemFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/AbstractMenuItemFactoryImpl.java index 1f6defc650..d31b158070 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/AbstractMenuItemFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/AbstractMenuItemFactoryImpl.java @@ -19,13 +19,7 @@ package com.hack23.cia.web.impl.ui.application.views.common.menufactory.impl; import com.hack23.cia.web.impl.ui.application.util.UserContextUtil; -import com.hack23.cia.web.impl.ui.application.views.common.pagelinks.api.PageModeMenuCommand; -import com.hack23.cia.web.impl.ui.application.views.common.viewnames.AdminViews; -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.DataSummaryPageMode; -import com.hack23.cia.web.impl.ui.application.views.common.viewnames.PageMode; -import com.hack23.cia.web.impl.ui.application.views.common.viewnames.UserViews; +import com.hack23.cia.web.impl.ui.application.views.common.menufactory.api.PageCommandUserConstants; import com.jarektoro.responsivelayout.ResponsiveRow; import com.vaadin.icons.VaadinIcons; import com.vaadin.server.Resource; @@ -41,209 +35,14 @@ /** * The Class AbstractMenuItemFactoryImpl. * - * This abstract class provides common functionality for creating menu items and button links - * in the Citizen Intelligence Agency web application. It includes methods for initializing - * application menus, creating admin menus, and generating button links with descriptions. + * This abstract class provides common functionality for creating menu items and + * button links + * in the Citizen Intelligence Agency web application. It includes methods for + * initializing + * application menus, creating admin menus, and generating button links with + * descriptions. */ -public abstract class AbstractMenuItemFactoryImpl { - - /** The Constant DASHBOARD. */ - private static final String DASHBOARD = "Dashboard"; - - /** The Constant ADMIN_TEXT. */ - private static final String ADMIN_TEXT = "Admin"; - - /** The Constant AGENCY. */ - private static final String AGENCY = "Agency"; - - /** The Constant AGENT_OPERATIONS_TEXT. */ - private static final String AGENT_OPERATIONS_TEXT = "Agent operations"; - - /** The Constant APPLICATION. */ - private static final String APPLICATION = "Application"; - - /** The Constant APPLICATION_CONFIGURATION. */ - private static final String APPLICATION_CONFIGURATION = "System settings"; - - /** The Constant APPLICATION_EVENT. */ - private static final String APPLICATION_EVENT = "Application Event"; - - /** The Constant APPLICATION_EVENT_CHARTS. */ - private static final String APPLICATION_EVENT_CHARTS = "Application Event charts"; - - /** The Constant APPLICATION_SESSION. */ - private static final String APPLICATION_SESSION = "Application Session"; - - /** The Constant APPLICATION_SESSION_CHARTS. */ - private static final String APPLICATION_SESSION_CHARTS = "Active Daily Users"; - - /** The Constant COMMAND_AGENCY. */ - private static final PageModeMenuCommand COMMAND_AGENCY = new PageModeMenuCommand(AdminViews.ADMIN_AGENCY_VIEW_NAME, ""); - - /** The Constant COMMAND_AGENT_OPERATION. */ - private static final PageModeMenuCommand COMMAND_AGENT_OPERATION = new PageModeMenuCommand( - AdminViews.ADMIN_AGENT_OPERATIONVIEW_NAME, ""); - - /** The Constant COMMAND_APPLICATION_CONFIGURATION. */ - private static final PageModeMenuCommand COMMAND_APPLICATION_CONFIGURATION = new PageModeMenuCommand( - AdminViews.ADMIN_APPLICATIONS_CONFIGURATION_VIEW_NAME, ""); - - /** The Constant COMMAND_APPLICATION_EVENTS. */ - private static final PageModeMenuCommand COMMAND_APPLICATION_EVENTS = new PageModeMenuCommand( - AdminViews.ADMIN_APPLICATIONS_EVENTS_VIEW_NAME, ""); - - /** The Constant COMMAND_APPLICATION_EVENTS_CHARTS. */ - private static final PageModeMenuCommand COMMAND_APPLICATION_EVENTS_CHARTS = new PageModeMenuCommand(AdminViews.ADMIN_APPLICATIONS_EVENTS_VIEW_NAME, PageMode.CHARTS); - - /** The Constant COMMAND_APPLICATION_SESSION. */ - private static final PageModeMenuCommand COMMAND_APPLICATION_SESSION = new PageModeMenuCommand( - AdminViews.ADMIN_APPLICATIONS_SESSION_VIEW_NAME, ""); - - /** The Constant COMMAND_APPLICATION_SESSION_CHARTS. */ - private static final PageModeMenuCommand COMMAND_APPLICATION_SESSION_CHARTS = new PageModeMenuCommand( - AdminViews.ADMIN_APPLICATIONS_SESSION_VIEW_NAME, PageMode.CHARTS); - - /** The Constant COMMAND_AUTHOR_DATASUMMARY. */ - private static final PageModeMenuCommand COMMAND_AUTHOR_DATASUMMARY = new PageModeMenuCommand( - AdminViews.ADMIN_DATA_SUMMARY_VIEW_NAME, DataSummaryPageMode.AUTHORS.toString()); - - /** The Constant COMMAND_COUNTRY. */ - private static final PageModeMenuCommand COMMAND_COUNTRY = new PageModeMenuCommand(AdminViews.ADMIN_COUNTRY_VIEW_NAME, ""); - - /** The Constant COMMAND_DATASUMMARY. */ - private static final PageModeMenuCommand COMMAND_DATASUMMARY = new PageModeMenuCommand( - AdminViews.ADMIN_DATA_SUMMARY_VIEW_NAME, ""); - - /** The Constant COMMAND_EMAIL. */ - private static final PageModeMenuCommand COMMAND_EMAIL = new PageModeMenuCommand(AdminViews.ADMIN_EMAIL_VIEW_NAME, - ""); - - /** The Constant COMMAND_LANGUAGE. */ - private static final PageModeMenuCommand COMMAND_LANGUAGE = new PageModeMenuCommand(AdminViews.ADMIN_LANGUAGE_VIEW_NAME, - ""); - - /** The Constant COMMAND_LOGIN. */ - private static final PageModeMenuCommand COMMAND_LOGIN = new PageModeMenuCommand(CommonsViews.MAIN_VIEW_NAME, - ApplicationPageMode.LOGIN.toString()); - - /** The Constant COMMAND_LOGOUT. */ - private static final PageModeMenuCommand COMMAND_LOGOUT = new PageModeMenuCommand(CommonsViews.MAIN_VIEW_NAME, - ApplicationPageMode.LOGOUT.toString()); - - /** The Constant COMMAND_MAINVIEW_OVERVIEW. */ - private static final PageModeMenuCommand COMMAND_MAINVIEW_OVERVIEW = new PageModeMenuCommand(CommonsViews.MAIN_VIEW_NAME, - PageMode.OVERVIEW); - - - /** The Constant COMMAND_DASHBOARDVIEW_OVERVIEW. */ - private static final PageModeMenuCommand COMMAND_DASHBOARDVIEW_OVERVIEW = new PageModeMenuCommand(CommonsViews.DASHBOARD_VIEW_NAME, - PageMode.OVERVIEW); - - /** The Constant COMMAND_MAINVIEW_PAGEVISITHISTORY. */ - private static final PageModeMenuCommand COMMAND_MAINVIEW_PAGEVISITHISTORY = new PageModeMenuCommand(CommonsViews.MAIN_VIEW_NAME, - PageMode.PAGEVISITHISTORY); - - /** The Constant COMMAND_MONITORING. */ - private static final PageModeMenuCommand COMMAND_MONITORING = new PageModeMenuCommand(AdminViews.ADMIN_MONITORING_VIEW_NAME, - ""); - - /** The Constant COMMAND_PORTAL. */ - private static final PageModeMenuCommand COMMAND_PORTAL = new PageModeMenuCommand(AdminViews.ADMIN_PORTAL_VIEW_NAME, ""); - - /** The Constant COMMAND_REGISTER. */ - private static final PageModeMenuCommand COMMAND_REGISTER = new PageModeMenuCommand(CommonsViews.MAIN_VIEW_NAME, - ApplicationPageMode.REGISTER.toString()); - - /** The Constant COMMAND_USERACCOUNT. */ - private static final PageModeMenuCommand COMMAND_USERACCOUNT = new PageModeMenuCommand(AdminViews.ADMIN_USERACCOUNT_VIEW_NAME, - ""); - - /** The Constant COMMAND_USERHOME. */ - private static final PageModeMenuCommand COMMAND_USERHOME = new PageModeMenuCommand(UserViews.USERHOME_VIEW_NAME, ""); - - /** The Constant CONFIGURATION. */ - private static final String CONFIGURATION = "Configuration"; - - /** The Constant COUNTRY. */ - private static final String COUNTRY = "Country"; - - /** The Constant DATA_AUTHOR_SUMMARY. */ - private static final String DATA_AUTHOR_SUMMARY = "Data author summary"; - - /** The Constant DATA_SUMMARY_TEXT. */ - private static final String DATA_SUMMARY_TEXT = "Data Summary"; - - /** The Constant DISPLAY_SIZE_LG_DEVICE. */ - private static final int DISPLAY_SIZE_LG_DEVICE = 4; - - /** The Constant DISPLAY_SIZE_MD_DEVICE. */ - private static final int DISPLAY_SIZE_MD_DEVICE = 4; - - /** The Constant DISPLAY_SIZE_XS_DEVICE. */ - private static final int DISPLAY_SIZE_XS_DEVICE = 12; - - /** The Constant DISPLAYS_SIZE_XM_DEVICE. */ - private static final int DISPLAYS_SIZE_XM_DEVICE = 6; - - /** The Constant EMAIL. */ - private static final String EMAIL = "Email"; - - /** The Constant HEADER_STYLE_NAME. */ - private static final String HEADER_STYLE_NAME = "Header"; - - /** The Constant LANGUAGE. */ - private static final String LANGUAGE = "Language"; - - /** The Constant LINK_STYLE_NAME. */ - private static final String LINK_STYLE_NAME = "link"; - - /** The Constant LOGIN. */ - private static final String LOGIN = "Login"; - - /** The Constant LOGOUT. */ - private static final String LOGOUT = "Logout"; - - /** The Constant MAIN. */ - private static final String MAIN = "Main"; - - /** The Constant MANAGEMENT. */ - private static final String MANAGEMENT = "Management"; - - /** The Constant MENU_BAR_WIDTH. */ - private static final String MENU_BAR_WIDTH = "80%"; - - /** The Constant PAGE_VISIT_HISTORY_TEXT. */ - private static final String PAGE_VISIT_HISTORY_TEXT = "Page Visit History"; - - /** The Constant PORTAL. */ - private static final String PORTAL = "Portal"; - - /** The Constant REGISTER. */ - private static final String REGISTER = "Register"; - - /** The Constant ROLE_ADMIN. */ - private static final String ROLE_ADMIN = "ROLE_ADMIN"; - - /** The Constant ROLE_USER. */ - private static final String ROLE_USER = "ROLE_USER"; - - /** The Constant START_TEXT. */ - private static final String START_TEXT = "Start"; - - /** The Constant SYSTEM_PERFORMANCE. */ - private static final String SYSTEM_PERFORMANCE = "System Performance"; - - /** The Constant USER_ACTIVITY. */ - private static final String USER_ACTIVITY = "User Activity"; - - /** The Constant USERACCOUNT. */ - private static final String USERACCOUNT = "Useraccount"; - - /** The Constant USERHOME. */ - private static final String USERHOME = "Userhome"; - - - +public abstract class AbstractMenuItemFactoryImpl implements PageCommandUserConstants { /** * Instantiates a new abstract menu item factory impl. @@ -256,40 +55,41 @@ public AbstractMenuItemFactoryImpl() { * Creates the admin menu. * * @param mainViewItem - * the main view item + * the main view item */ private static void createAdminMenu(final MenuItem mainViewItem) { if (UserContextUtil.allowRoleInSecurityContext(ROLE_ADMIN)) { final MenuItem adminMenuItem = mainViewItem.addItem(ADMIN_TEXT, VaadinIcons.SERVER, null); final MenuItem configurationMenuItem = adminMenuItem.addItem(CONFIGURATION, VaadinIcons.TOOLS, null); - configurationMenuItem.addItem(APPLICATION_CONFIGURATION,VaadinIcons.TOOLS, COMMAND_APPLICATION_CONFIGURATION); + configurationMenuItem.addItem(APPLICATION_CONFIGURATION, VaadinIcons.TOOLS, + COMMAND_APPLICATION_CONFIGURATION); - configurationMenuItem.addItem(AGENCY,VaadinIcons.SERVER, COMMAND_AGENCY); - configurationMenuItem.addItem(PORTAL, VaadinIcons.SITEMAP,COMMAND_PORTAL); - configurationMenuItem.addItem(COUNTRY,VaadinIcons.FLAG, COMMAND_COUNTRY); - configurationMenuItem.addItem(LANGUAGE,VaadinIcons.ACCESSIBILITY, COMMAND_LANGUAGE); + configurationMenuItem.addItem(AGENCY, VaadinIcons.SERVER, COMMAND_AGENCY); + configurationMenuItem.addItem(PORTAL, VaadinIcons.SITEMAP, COMMAND_PORTAL); + configurationMenuItem.addItem(COUNTRY, VaadinIcons.FLAG, COMMAND_COUNTRY); + configurationMenuItem.addItem(LANGUAGE, VaadinIcons.ACCESSIBILITY, COMMAND_LANGUAGE); final MenuItem managementMenuItem = adminMenuItem.addItem(MANAGEMENT, VaadinIcons.SERVER, null); - managementMenuItem.addItem(AGENT_OPERATIONS_TEXT,VaadinIcons.BRIEFCASE, COMMAND_AGENT_OPERATION); - - managementMenuItem.addItem(DATA_SUMMARY_TEXT,VaadinIcons.DATABASE, COMMAND_DATASUMMARY); - managementMenuItem.addItem(DATA_AUTHOR_SUMMARY,VaadinIcons.DATABASE, COMMAND_AUTHOR_DATASUMMARY); + managementMenuItem.addItem(AGENT_OPERATIONS_TEXT, VaadinIcons.BRIEFCASE, COMMAND_AGENT_OPERATION); + managementMenuItem.addItem(DATA_SUMMARY_TEXT, VaadinIcons.DATABASE, COMMAND_DATASUMMARY); + managementMenuItem.addItem(DATA_AUTHOR_SUMMARY, VaadinIcons.DATABASE, COMMAND_AUTHOR_DATASUMMARY); - managementMenuItem.addItem(EMAIL,VaadinIcons.MAILBOX, COMMAND_EMAIL); + managementMenuItem.addItem(EMAIL, VaadinIcons.MAILBOX, COMMAND_EMAIL); - - managementMenuItem.addItem(SYSTEM_PERFORMANCE,VaadinIcons.DASHBOARD, COMMAND_MONITORING); + managementMenuItem.addItem(SYSTEM_PERFORMANCE, VaadinIcons.DASHBOARD, COMMAND_MONITORING); final MenuItem userActivityMenuItem = adminMenuItem.addItem(USER_ACTIVITY, VaadinIcons.DATABASE, null); - userActivityMenuItem.addItem(APPLICATION_SESSION,VaadinIcons.LAPTOP, COMMAND_APPLICATION_SESSION); - userActivityMenuItem.addItem(APPLICATION_SESSION_CHARTS,VaadinIcons.LAPTOP, COMMAND_APPLICATION_SESSION_CHARTS); - userActivityMenuItem.addItem(APPLICATION_EVENT,VaadinIcons.ARROWS, COMMAND_APPLICATION_EVENTS); - userActivityMenuItem.addItem(APPLICATION_EVENT_CHARTS,VaadinIcons.ARROWS, COMMAND_APPLICATION_EVENTS_CHARTS); + userActivityMenuItem.addItem(APPLICATION_SESSION, VaadinIcons.LAPTOP, COMMAND_APPLICATION_SESSION); + userActivityMenuItem.addItem(APPLICATION_SESSION_CHARTS, VaadinIcons.LAPTOP, + COMMAND_APPLICATION_SESSION_CHARTS); + userActivityMenuItem.addItem(APPLICATION_EVENT, VaadinIcons.ARROWS, COMMAND_APPLICATION_EVENTS); + userActivityMenuItem.addItem(APPLICATION_EVENT_CHARTS, VaadinIcons.ARROWS, + COMMAND_APPLICATION_EVENTS_CHARTS); - userActivityMenuItem.addItem(USERACCOUNT,VaadinIcons.GROUP, COMMAND_USERACCOUNT); + userActivityMenuItem.addItem(USERACCOUNT, VaadinIcons.GROUP, COMMAND_USERACCOUNT); } } @@ -298,23 +98,23 @@ private static void createAdminMenu(final MenuItem mainViewItem) { * Creates the button link. * * @param row - * the panel content + * the panel content * @param linkText - * the link text + * the link text * @param icon - * the icon + * the icon * @param command - * the command + * the command * @param description - * the description + * the description */ - protected static final void createButtonLink(final ResponsiveRow row,final String linkText,final Resource icon, final ClickListener command, final String description) { + protected static final void createButtonLink(final ResponsiveRow row, final String linkText, final Resource icon, + final ClickListener command, final String description) { final CssLayout layout = new CssLayout(); layout.addStyleName("v-layout-content-overview-panel-level2"); Responsive.makeResponsive(layout); layout.setSizeUndefined(); - final Button button = new Button(linkText); Responsive.makeResponsive(button); button.setStyleName(LINK_STYLE_NAME); @@ -323,7 +123,6 @@ protected static final void createButtonLink(final ResponsiveRow row,final Strin button.setIcon(icon); button.setWidth(100, Unit.PERCENTAGE); - layout.addComponent(button); final Label descriptionLabel = new Label(description); @@ -332,14 +131,15 @@ protected static final void createButtonLink(final ResponsiveRow row,final Strin descriptionLabel.setWidth(100, Unit.PERCENTAGE); layout.addComponent(descriptionLabel); - row.addColumn().withDisplayRules(DISPLAY_SIZE_XS_DEVICE,DISPLAYS_SIZE_XM_DEVICE,DISPLAY_SIZE_MD_DEVICE,DISPLAY_SIZE_LG_DEVICE).withComponent(layout); + row.addColumn().withDisplayRules(DISPLAY_SIZE_XS_DEVICE, DISPLAYS_SIZE_XM_DEVICE, DISPLAY_SIZE_MD_DEVICE, + DISPLAY_SIZE_LG_DEVICE).withComponent(layout); } /** * Inits the application menu bar. * * @param menuBar - * the menu bar + * the menu bar */ protected static final void initApplicationMenuBar(final MenuBar menuBar) { menuBar.removeItems(); @@ -355,9 +155,9 @@ protected static final void initApplicationMenuBar(final MenuBar menuBar) { mainItem.addItem(PAGE_VISIT_HISTORY_TEXT, VaadinIcons.CHART, COMMAND_MAINVIEW_PAGEVISITHISTORY); - - if (UserContextUtil.allowRoleInSecurityContext(ROLE_ADMIN) || UserContextUtil.allowRoleInSecurityContext(ROLE_USER)) { - mainViewItem.addItem(USERHOME, VaadinIcons.USER,COMMAND_USERHOME); + if (UserContextUtil.allowRoleInSecurityContext(ROLE_ADMIN) + || UserContextUtil.allowRoleInSecurityContext(ROLE_USER)) { + mainViewItem.addItem(USERHOME, VaadinIcons.USER, COMMAND_USERHOME); createAdminMenu(mainViewItem); mainViewItem.addItem(LOGOUT, VaadinIcons.SIGN_OUT, COMMAND_LOGOUT); } else { diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/ApplicationMenuItemFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/ApplicationMenuItemFactoryImpl.java index 9910e3af48..0c539ebeb1 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/ApplicationMenuItemFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/ApplicationMenuItemFactoryImpl.java @@ -23,12 +23,7 @@ import com.hack23.cia.web.impl.ui.application.views.common.menufactory.api.ParliamentMenuItemFactory; import com.hack23.cia.web.impl.ui.application.views.common.menufactory.api.PartyRankingMenuItemFactory; import com.hack23.cia.web.impl.ui.application.views.common.menufactory.api.PoliticianRankingMenuItemFactory; -import com.hack23.cia.web.impl.ui.application.views.common.pagelinks.api.PageModeMenuCommand; import com.hack23.cia.web.impl.ui.application.views.common.rows.RowUtil; -import com.hack23.cia.web.impl.ui.application.views.common.viewnames.ChartIndicators; -import com.hack23.cia.web.impl.ui.application.views.common.viewnames.CommonsViews; -import com.hack23.cia.web.impl.ui.application.views.common.viewnames.PageMode; -import com.hack23.cia.web.impl.ui.application.views.common.viewnames.UserViews; import com.jarektoro.responsivelayout.ResponsiveRow; import com.vaadin.icons.VaadinIcons; import com.vaadin.ui.MenuBar; @@ -38,183 +33,17 @@ /** * The Class ApplicationMenuItemFactoryImpl. * - * This class is responsible for creating and managing the application menu items, - * including ranking menus and overview pages. It integrates various menu item factories - * to provide a comprehensive menu structure for the Citizen Intelligence Agency web application. + * This class is responsible for creating and managing the application menu + * items, + * including ranking menus and overview pages. It integrates various menu item + * factories + * to provide a comprehensive menu structure for the Citizen Intelligence Agency + * web application. */ @Service public final class ApplicationMenuItemFactoryImpl extends AbstractMenuItemFactoryImpl implements ApplicationMenuItemFactory { - /** The Constant SWEDEN_DASHBOARD. */ - private static final String SWEDEN_DASHBOARD = "Sweden Dashboard"; - - /** The Constant COMMAND_COMMITTEE_RANKING_DATAGRID. */ - private static final PageModeMenuCommand COMMAND_COMMITTEE_RANKING_DATAGRID = new PageModeMenuCommand(UserViews.COMMITTEE_RANKING_VIEW_NAME, PageMode.DATAGRID); - - /** The Constant COMMAND_COMMITTEE_RANKING_OVERVIEW. */ - private static final PageModeMenuCommand COMMAND_COMMITTEE_RANKING_OVERVIEW = new PageModeMenuCommand(UserViews.COMMITTEE_RANKING_VIEW_NAME, PageMode.OVERVIEW); - - /** The Constant COMMAND_COUNTRY_RANKING_OVERVIEW. */ - private static final PageModeMenuCommand COMMAND_COUNTRY_RANKING_OVERVIEW = new PageModeMenuCommand(UserViews.COUNTRY_RANKING_VIEW_NAME, PageMode.OVERVIEW); - - /** The Constant COMMAND_DASHBOARDVIEW_OVERVIEW. */ - private static final PageModeMenuCommand COMMAND_DASHBOARDVIEW_OVERVIEW = new PageModeMenuCommand(CommonsViews.DASHBOARD_VIEW_NAME, - PageMode.OVERVIEW); - - - /** The Constant COMMAND_DOCUMENTS. */ - private static final PageModeMenuCommand COMMAND_DOCUMENTS = new PageModeMenuCommand(UserViews.DOCUMENTS_VIEW_NAME, PageMode.OVERVIEW); - - /** The Constant COMMAND_GOVERNMENT_BODY_RANKING_DATAGRID. */ - private static final PageModeMenuCommand COMMAND_GOVERNMENT_BODY_RANKING_DATAGRID = new PageModeMenuCommand(UserViews.GOVERNMENT_BODY_RANKING_VIEW_NAME, PageMode.DATAGRID); - - /** The Constant COMMAND_GOVERNMENT_BODY_RANKING_OVERVIEW. */ - private static final PageModeMenuCommand COMMAND_GOVERNMENT_BODY_RANKING_OVERVIEW = new PageModeMenuCommand(UserViews.GOVERNMENT_BODY_RANKING_VIEW_NAME, PageMode.OVERVIEW); - - /** The Constant COMMAND_MINISTRY_RANKING_DATAGRID. */ - private static final PageModeMenuCommand COMMAND_MINISTRY_RANKING_DATAGRID = new PageModeMenuCommand(UserViews.MINISTRY_RANKING_VIEW_NAME, PageMode.DATAGRID); - - /** The Constant COMMAND_MINISTRY_RANKING_OVERVIEW. */ - private static final PageModeMenuCommand COMMAND_MINISTRY_RANKING_OVERVIEW = new PageModeMenuCommand(UserViews.MINISTRY_RANKING_VIEW_NAME, PageMode.OVERVIEW); - - /** The Constant COMMAND_PARLIAMENT_RANKING_OVERVIEW. */ - private static final PageModeMenuCommand COMMAND_PARLIAMENT_RANKING_OVERVIEW = new PageModeMenuCommand(UserViews.PARLIAMENT_RANKING_VIEW_NAME, PageMode.OVERVIEW); - - /** The Constant COMMAND_PARTY_RANKING_DATAGRID. */ - private static final PageModeMenuCommand COMMAND_PARTY_RANKING_DATAGRID = new PageModeMenuCommand(UserViews.PARTY_RANKING_VIEW_NAME, PageMode.DATAGRID); - - /** The Constant COMMAND_PARTY_RANKING_OVERVIEW. */ - private static final PageModeMenuCommand COMMAND_PARTY_RANKING_OVERVIEW = new PageModeMenuCommand(UserViews.PARTY_RANKING_VIEW_NAME, PageMode.OVERVIEW); - - /** The Constant COMMAND_POLITICIAN_RANKING_DATAGRID. */ - private static final PageModeMenuCommand COMMAND_POLITICIAN_RANKING_DATAGRID = new PageModeMenuCommand(UserViews.POLITICIAN_RANKING_VIEW_NAME, PageMode.DATAGRID); - - /** The Constant COMMAND_POLITICIAN_RANKING_OVERVIEW. */ - private static final PageModeMenuCommand COMMAND_POLITICIAN_RANKING_OVERVIEW = new PageModeMenuCommand(UserViews.POLITICIAN_RANKING_VIEW_NAME, PageMode.OVERVIEW); - - /** The Constant COMMAND_SEARCH_DOCUMENT. */ - private static final PageModeMenuCommand COMMAND_SEARCH_DOCUMENT = new PageModeMenuCommand(UserViews.SEARCH_DOCUMENT_VIEW_NAME, ""); - - /** The Constant COMMAND_CHARTS_CURRENT_MINISTRIES_LEADER_SCOREBOARD. */ - private static final PageModeMenuCommand COMMAND_CHARTS_CURRENT_MINISTRIES_LEADER_SCOREBOARD = new PageModeMenuCommand(UserViews.MINISTRY_RANKING_VIEW_NAME, - PageMode.CHARTS, ChartIndicators.CURRENTMINISTRIESLEADERSCORECARD.toString()); - - /** The Constant COMMAND_CHARTS_CURRENT_PARTIES_LEADER_SCOREBOARD. */ - private static final PageModeMenuCommand COMMAND_CHARTS_CURRENT_PARTIES_LEADER_SCOREBOARD = new PageModeMenuCommand(UserViews.PARTY_RANKING_VIEW_NAME, PageMode.CHARTS, ChartIndicators.CURRENTPARTYLEADERSCORECARD.toString()); - - - /** The Constant COMMITTEE_RANKING_TEXT. */ - private static final String COMMITTEE_RANKING_TEXT = "Committee Ranking"; - - /** The Constant DESC_LEADERS_SCOREBOARD. */ - private static final String DESC_LEADERS_SCOREBOARD = "Leaders: comparing party leadership impact."; - - /** The Constant PART_LEADERS_SCOREBOARD. */ - private static final String PART_LEADERS_SCOREBOARD = "Party leaders scoreboard"; - - /** The Constant COMMITTEE_RANKING_LINK_TEXT. */ - private static final String COMMITTEE_RANKING_LINK_TEXT = COMMITTEE_RANKING_TEXT; - - /** The Constant COMMITTEES_LINK_TEXT. */ - private static final String COMMITTEES_LINK_TEXT = "Committees"; - - /** The Constant COUNTRY_RANKING_LINK_TEXT. */ - private static final String COUNTRY_RANKING_LINK_TEXT = "Country Ranking"; - - /** The Constant DOCUMENTS. */ - private static final String DOCUMENTS = "Documents"; - - /** The Constant GOVERNMENT_BODIES. */ - private static final String GOVERNMENT_BODIES = "Government bodies"; - - /** The Constant GOVERNMENT_BODY_RANKING. */ - private static final String GOVERNMENT_BODY_RANKING = "Government body Ranking"; - - /** The Constant MINISTRIES_LINK_TEXT. */ - private static final String MINISTRIES_LINK_TEXT = "Ministries"; - - /** The Constant MINISTRY_RANKING. */ - private static final String MINISTRY_RANKING = "Ministry Ranking"; - - /** The Constant MINISTRY_RANKING_LINK_TEXT. */ - private static final String MINISTRY_RANKING_LINK_TEXT = MINISTRY_RANKING; - - /** The Constant PARLIAMENT_RANKING_LINK_TEXT. */ - private static final String PARLIAMENT_RANKING_LINK_TEXT = "Parliament Ranking"; - - /** The Constant PARTIES_LINK_TEXT. */ - private static final String PARTIES_LINK_TEXT = "Parties"; - - /** The Constant PARTY_RANKING. */ - private static final String PARTY_RANKING = "Party Ranking"; - - /** The Constant PARTY_RANKING_LINK_TEXT. */ - private static final String PARTY_RANKING_LINK_TEXT = PARTY_RANKING; - - /** The Constant POLITICIAN_RANKING. */ - private static final String POLITICIAN_RANKING = "Politician Ranking"; - - /** The Constant POLITICIAN_RANKING_LINK_TEXT. */ - private static final String POLITICIAN_RANKING_LINK_TEXT = POLITICIAN_RANKING; - - /** The Constant POLITICIANS_LINK_TEXT. */ - private static final String POLITICIANS_LINK_TEXT = "Politicians"; - - /** The Constant RANKING_TEXT. */ - private static final String RANKING_TEXT = "Ranking"; - - /** The Constant SEARCH_DOCUMENTS. */ - private static final String SEARCH_DOCUMENTS = "Search documents"; - - /** The Constant COUNTRY_RANKING_DESCRIPTION. */ - private static final String COUNTRY_RANKING_DESCRIPTION = "Sweden’s governance: key indicators."; - - /** The Constant MINISTRIES_LEADER_SCOREBOARD. */ - private static final String MINISTRIES_LEADER_SCOREBOARD = "Government Ministers Scoreboard"; - - /** The Constant MINISTRIES_LEADER_SCOREBOARD_DESCRIPTION. */ - private static final String MINISTRIES_LEADER_SCOREBOARD_DESCRIPTION = "Cabinet leaders: power and institutional impact."; - - /** The Constant MINISTRY_RANKING_DESCRIPTION. */ - private static final String MINISTRY_RANKING_DESCRIPTION = "Ministry influence on policy."; - - /** The Constant MINISTRIES_DESCRIPTION. */ - private static final String MINISTRIES_DESCRIPTION = "All ministries: roles and commitments."; - - /** The Constant GOVERNMENT_BODY_RANKING_DESCRIPTION. */ - private static final String GOVERNMENT_BODY_RANKING_DESCRIPTION = "Government bodies: performance snapshots."; - - /** The Constant GOVERNMENT_BODIES_DESCRIPTION. */ - private static final String GOVERNMENT_BODIES_DESCRIPTION = "All bodies: structure and influence."; - - /** The Constant PARLIAMENT_RANKING_DESCRIPTION. */ - private static final String PARLIAMENT_RANKING_DESCRIPTION = "Parliament: legislative effectiveness."; - - /** The Constant COMMITTEE_RANKING_DESCRIPTION. */ - private static final String COMMITTEE_RANKING_DESCRIPTION = "Committees: shaping policy debates."; - - /** The Constant COMMITTEES_DESCRIPTION. */ - private static final String COMMITTEES_DESCRIPTION = "All committees: roles and responsibilities."; - - /** The Constant PARTY_RANKING_DESCRIPTION. */ - private static final String PARTY_RANKING_DESCRIPTION = "Parties: influence on agenda."; - - /** The Constant PARTIES_DESCRIPTION. */ - private static final String PARTIES_DESCRIPTION = "All parties: leadership and policy roles."; - - /** The Constant POLITICIAN_RANKING_DESCRIPTION. */ - private static final String POLITICIAN_RANKING_DESCRIPTION = "Politicians: individual impact."; - - /** The Constant POLITICIANS_DESCRIPTION. */ - private static final String POLITICIANS_DESCRIPTION = "All politicians: service and contributions."; - - /** The Constant SEARCH_DOCUMENTS_DESCRIPTION. */ - private static final String SEARCH_DOCUMENTS_DESCRIPTION = "Search documents: legislative records."; - - /** The Constant DOCUMENTS_DESCRIPTION. */ - private static final String DOCUMENTS_DESCRIPTION = "All documents: official records."; - /** The committee ranking menu item factory. */ @Autowired private CommitteeRankingMenuItemFactory committeeRankingMenuItemFactory; @@ -259,34 +88,45 @@ public ApplicationMenuItemFactoryImpl() { public void addRankingMenu(final MenuBar menuBar) { final MenuItem rankingsMenuItem = menuBar.addItem(RANKING_TEXT, VaadinIcons.LINE_CHART, null); - final MenuItem swedenMenuItem = rankingsMenuItem.addItem(SWEDEN_DASHBOARD, VaadinIcons.FLAG, COMMAND_DASHBOARDVIEW_OVERVIEW); + final MenuItem swedenMenuItem = rankingsMenuItem.addItem(SWEDEN_DASHBOARD, VaadinIcons.FLAG, + COMMAND_DASHBOARDVIEW_OVERVIEW); countryMenuItemFactory.createCountryTopicMenu(swedenMenuItem); - rankingsMenuItem.addItem(MINISTRIES_LEADER_SCOREBOARD, VaadinIcons.TROPHY,COMMAND_CHARTS_CURRENT_MINISTRIES_LEADER_SCOREBOARD); - rankingsMenuItem.addItem(PART_LEADERS_SCOREBOARD, VaadinIcons.TROPHY,COMMAND_CHARTS_CURRENT_PARTIES_LEADER_SCOREBOARD); + rankingsMenuItem.addItem(MINISTRIES_LEADER_SCOREBOARD, VaadinIcons.TROPHY, + COMMAND_CHARTS_CURRENT_MINISTRIES_LEADER_SCOREBOARD); + rankingsMenuItem.addItem(PART_LEADERS_SCOREBOARD, VaadinIcons.TROPHY, + COMMAND_CHARTS_CURRENT_PARTIES_LEADER_SCOREBOARD); - final MenuItem countryMenuItem = rankingsMenuItem.addItem(COUNTRY_RANKING_LINK_TEXT, VaadinIcons.FLAG, COMMAND_COUNTRY_RANKING_OVERVIEW); + final MenuItem countryMenuItem = rankingsMenuItem.addItem(COUNTRY_RANKING_LINK_TEXT, VaadinIcons.FLAG, + COMMAND_COUNTRY_RANKING_OVERVIEW); countryMenuItemFactory.createCountryTopicMenu(countryMenuItem); - final MenuItem ministryMenuItem = rankingsMenuItem.addItem(MINISTRY_RANKING_LINK_TEXT, VaadinIcons.OFFICE, COMMAND_MINISTRY_RANKING_OVERVIEW); + final MenuItem ministryMenuItem = rankingsMenuItem.addItem(MINISTRY_RANKING_LINK_TEXT, VaadinIcons.OFFICE, + COMMAND_MINISTRY_RANKING_OVERVIEW); ministryRankingMenuItemFactory.createMinistryRankingTopics(ministryMenuItem); - final MenuItem govbodyMenuItem = rankingsMenuItem.addItem(GOVERNMENT_BODY_RANKING, VaadinIcons.BUILDING_O, COMMAND_GOVERNMENT_BODY_RANKING_OVERVIEW); + final MenuItem govbodyMenuItem = rankingsMenuItem.addItem(GOVERNMENT_BODY_RANKING, VaadinIcons.BUILDING_O, + COMMAND_GOVERNMENT_BODY_RANKING_OVERVIEW); governmentBodyRankingMenuItemFactory.createGovernmentBodyRankingTopics(govbodyMenuItem); - final MenuItem parliamentMenuItem = rankingsMenuItem.addItem(PARLIAMENT_RANKING_LINK_TEXT, VaadinIcons.INSTITUTION, COMMAND_PARLIAMENT_RANKING_OVERVIEW); + final MenuItem parliamentMenuItem = rankingsMenuItem.addItem(PARLIAMENT_RANKING_LINK_TEXT, + VaadinIcons.INSTITUTION, COMMAND_PARLIAMENT_RANKING_OVERVIEW); parliamentMenuItemFactory.createParliamentTopicMenu(parliamentMenuItem); - final MenuItem committeeMenuItem = rankingsMenuItem.addItem(COMMITTEE_RANKING_LINK_TEXT, VaadinIcons.GROUP, COMMAND_COMMITTEE_RANKING_OVERVIEW); + final MenuItem committeeMenuItem = rankingsMenuItem.addItem(COMMITTEE_RANKING_LINK_TEXT, VaadinIcons.GROUP, + COMMAND_COMMITTEE_RANKING_OVERVIEW); committeeRankingMenuItemFactory.createCommitteeRankingTopics(committeeMenuItem); - final MenuItem partynMenuItem = rankingsMenuItem.addItem(PARTY_RANKING_LINK_TEXT, VaadinIcons.USERS, COMMAND_PARTY_RANKING_OVERVIEW); + final MenuItem partynMenuItem = rankingsMenuItem.addItem(PARTY_RANKING_LINK_TEXT, VaadinIcons.USERS, + COMMAND_PARTY_RANKING_OVERVIEW); partyRankingMenuItemFactory.createPartyRankingTopics(partynMenuItem); - final MenuItem politicianMenuItem = rankingsMenuItem.addItem(POLITICIAN_RANKING_LINK_TEXT, VaadinIcons.USER, COMMAND_POLITICIAN_RANKING_OVERVIEW); + final MenuItem politicianMenuItem = rankingsMenuItem.addItem(POLITICIAN_RANKING_LINK_TEXT, VaadinIcons.USER, + COMMAND_POLITICIAN_RANKING_OVERVIEW); politicianRankingMenuItemFactory.createPoliticianRankingTopics(politicianMenuItem); - final MenuItem documentsMenuItem = rankingsMenuItem.addItem(DOCUMENTS, VaadinIcons.FILE_TABLE, COMMAND_DOCUMENTS); + final MenuItem documentsMenuItem = rankingsMenuItem.addItem(DOCUMENTS, VaadinIcons.FILE_TABLE, + COMMAND_DOCUMENTS); documentsMenuItem.addItem("List all", VaadinIcons.FILE_TABLE, COMMAND_DOCUMENTS); documentsMenuItem.addItem(SEARCH_DOCUMENTS, VaadinIcons.SEARCH, COMMAND_SEARCH_DOCUMENT); } @@ -313,27 +153,41 @@ public MenuBar createMainPageMenuBar(final MenuBar menuBar) { public void createOverviewPage(final VerticalLayout panelContent) { final ResponsiveRow grid = RowUtil.createGridLayout(panelContent); - - createButtonLink(grid, "Sweden Dashboard", VaadinIcons.FLAG, COMMAND_DASHBOARDVIEW_OVERVIEW, "Visualize political activity in Sweden, present key performance indicators and metadata"); - createButtonLink(grid, MINISTRIES_LEADER_SCOREBOARD, VaadinIcons.TROPHY, COMMAND_CHARTS_CURRENT_MINISTRIES_LEADER_SCOREBOARD, - MINISTRIES_LEADER_SCOREBOARD_DESCRIPTION); - - createButtonLink(grid, PART_LEADERS_SCOREBOARD, VaadinIcons.TROPHY, - COMMAND_CHARTS_CURRENT_PARTIES_LEADER_SCOREBOARD, DESC_LEADERS_SCOREBOARD); - - createButtonLink(grid, COUNTRY_RANKING_LINK_TEXT, VaadinIcons.FLAG, COMMAND_COUNTRY_RANKING_OVERVIEW, COUNTRY_RANKING_DESCRIPTION); - createButtonLink(grid, MINISTRY_RANKING_LINK_TEXT, VaadinIcons.OFFICE, COMMAND_MINISTRY_RANKING_OVERVIEW, MINISTRY_RANKING_DESCRIPTION); - createButtonLink(grid, MINISTRIES_LINK_TEXT, VaadinIcons.OFFICE, COMMAND_MINISTRY_RANKING_DATAGRID, MINISTRIES_DESCRIPTION); - createButtonLink(grid, GOVERNMENT_BODY_RANKING, VaadinIcons.BUILDING_O, COMMAND_GOVERNMENT_BODY_RANKING_OVERVIEW, GOVERNMENT_BODY_RANKING_DESCRIPTION); - createButtonLink(grid, GOVERNMENT_BODIES, VaadinIcons.BUILDING_O, COMMAND_GOVERNMENT_BODY_RANKING_DATAGRID, GOVERNMENT_BODIES_DESCRIPTION); - createButtonLink(grid, PARLIAMENT_RANKING_LINK_TEXT, VaadinIcons.INSTITUTION, COMMAND_PARLIAMENT_RANKING_OVERVIEW, PARLIAMENT_RANKING_DESCRIPTION); - createButtonLink(grid, COMMITTEE_RANKING_LINK_TEXT, VaadinIcons.GROUP, COMMAND_COMMITTEE_RANKING_OVERVIEW, COMMITTEE_RANKING_DESCRIPTION); - createButtonLink(grid, COMMITTEES_LINK_TEXT, VaadinIcons.GROUP, COMMAND_COMMITTEE_RANKING_DATAGRID, COMMITTEES_DESCRIPTION); - createButtonLink(grid, PARTY_RANKING_LINK_TEXT, VaadinIcons.USERS, COMMAND_PARTY_RANKING_OVERVIEW, PARTY_RANKING_DESCRIPTION); - createButtonLink(grid, PARTIES_LINK_TEXT, VaadinIcons.USERS, COMMAND_PARTY_RANKING_DATAGRID, PARTIES_DESCRIPTION); - createButtonLink(grid, POLITICIAN_RANKING_LINK_TEXT, VaadinIcons.USER, COMMAND_POLITICIAN_RANKING_OVERVIEW, POLITICIAN_RANKING_DESCRIPTION); - createButtonLink(grid, POLITICIANS_LINK_TEXT, VaadinIcons.USER, COMMAND_POLITICIAN_RANKING_DATAGRID, POLITICIANS_DESCRIPTION); - createButtonLink(grid, SEARCH_DOCUMENTS, VaadinIcons.SEARCH, COMMAND_SEARCH_DOCUMENT, SEARCH_DOCUMENTS_DESCRIPTION); + createButtonLink(grid, SWEDEN_DASHBOARD, VaadinIcons.FLAG, COMMAND_DASHBOARDVIEW_OVERVIEW, + "Visualize political activity in Sweden, present key performance indicators and metadata"); + createButtonLink(grid, MINISTRIES_LEADER_SCOREBOARD, VaadinIcons.TROPHY, + COMMAND_CHARTS_CURRENT_MINISTRIES_LEADER_SCOREBOARD, + MINISTRIES_LEADER_SCOREBOARD_DESCRIPTION); + + createButtonLink(grid, PART_LEADERS_SCOREBOARD, VaadinIcons.TROPHY, + COMMAND_CHARTS_CURRENT_PARTIES_LEADER_SCOREBOARD, DESC_LEADERS_SCOREBOARD); + + createButtonLink(grid, COUNTRY_RANKING_LINK_TEXT, VaadinIcons.FLAG, COMMAND_COUNTRY_RANKING_OVERVIEW, + COUNTRY_RANKING_DESCRIPTION); + createButtonLink(grid, MINISTRY_RANKING_LINK_TEXT, VaadinIcons.OFFICE, COMMAND_MINISTRY_RANKING_OVERVIEW, + MINISTRY_RANKING_DESCRIPTION); + createButtonLink(grid, MINISTRIES_LINK_TEXT, VaadinIcons.OFFICE, COMMAND_MINISTRY_RANKING_DATAGRID, + MINISTRIES_DESCRIPTION); + createButtonLink(grid, GOVERNMENT_BODY_RANKING, VaadinIcons.BUILDING_O, + COMMAND_GOVERNMENT_BODY_RANKING_OVERVIEW, GOVERNMENT_BODY_RANKING_DESCRIPTION); + createButtonLink(grid, GOVERNMENT_BODIES, VaadinIcons.BUILDING_O, COMMAND_GOVERNMENT_BODY_RANKING_DATAGRID, + GOVERNMENT_BODIES_DESCRIPTION); + createButtonLink(grid, PARLIAMENT_RANKING_LINK_TEXT, VaadinIcons.INSTITUTION, + COMMAND_PARLIAMENT_RANKING_OVERVIEW, PARLIAMENT_RANKING_DESCRIPTION); + createButtonLink(grid, COMMITTEE_RANKING_LINK_TEXT, VaadinIcons.GROUP, COMMAND_COMMITTEE_RANKING_OVERVIEW, + COMMITTEE_RANKING_DESCRIPTION); + createButtonLink(grid, COMMITTEES_LINK_TEXT, VaadinIcons.GROUP, COMMAND_COMMITTEE_RANKING_DATAGRID, + COMMITTEES_DESCRIPTION); + createButtonLink(grid, PARTY_RANKING_LINK_TEXT, VaadinIcons.USERS, COMMAND_PARTY_RANKING_OVERVIEW, + PARTY_RANKING_DESCRIPTION); + createButtonLink(grid, PARTIES_LINK_TEXT, VaadinIcons.USERS, COMMAND_PARTY_RANKING_DATAGRID, + PARTIES_DESCRIPTION); + createButtonLink(grid, POLITICIAN_RANKING_LINK_TEXT, VaadinIcons.USER, COMMAND_POLITICIAN_RANKING_OVERVIEW, + POLITICIAN_RANKING_DESCRIPTION); + createButtonLink(grid, POLITICIANS_LINK_TEXT, VaadinIcons.USER, COMMAND_POLITICIAN_RANKING_DATAGRID, + POLITICIANS_DESCRIPTION); + createButtonLink(grid, SEARCH_DOCUMENTS, VaadinIcons.SEARCH, COMMAND_SEARCH_DOCUMENT, + SEARCH_DOCUMENTS_DESCRIPTION); createButtonLink(grid, DOCUMENTS, VaadinIcons.FILE_TABLE, COMMAND_DOCUMENTS, DOCUMENTS_DESCRIPTION); } } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/CommitteeMenuItemFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/CommitteeMenuItemFactoryImpl.java index c16d1a5997..33ed27f05a 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/CommitteeMenuItemFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/CommitteeMenuItemFactoryImpl.java @@ -45,79 +45,8 @@ * overview pages with relevant descriptions and icons. */ @Service -public final class CommitteeMenuItemFactoryImpl extends AbstractMenuItemFactoryImpl implements CommitteeMenuItemFactory { - - /** The Constant BALLOT_DECISION_SUMMARY_TEXT. */ - private static final String BALLOT_DECISION_SUMMARY_TEXT = "Ballot Decision Summary"; - - /** The Constant BALLOTS_TEXT. */ - private static final String BALLOTS_TEXT = "Ballots"; - - /** The Constant COMMITTEE_RANKING_TEXT. */ - private static final String COMMITTEE_RANKING_TEXT = "Committee Ranking"; - - /** The Constant CURRENT_MEMBERS_TEXT. */ - private static final String CURRENT_MEMBERS_TEXT = "Current Members"; - - /** The Constant DECISION_SUMMARY_TEXT. */ - private static final String DECISION_SUMMARY_TEXT = "Decision Summary"; - - /** The Constant DECISION_TYPE_DAILY_SUMMARY_TEXT. */ - private static final String DECISION_TYPE_DAILY_SUMMARY_TEXT = "Decision Type Daily Summary"; - - /** The Constant DOCUMENT_ACTIVITY_TEXT. */ - private static final String DOCUMENT_ACTIVITY_TEXT = "Document Activity"; - - /** The Constant DOCUMENT_HISTORY_TEXT. */ - private static final String DOCUMENT_HISTORY_TEXT = "Document history"; - - /** The Constant DOCUMENTS_TEXT. */ - private static final String DOCUMENTS_TEXT = "Documents"; - - /** The Constant MEMBER_HISTORY_TEXT. */ - private static final String MEMBER_HISTORY_TEXT = "Member History"; - - /** The Constant OVERVIEW_TEXT. */ - private static final String OVERVIEW_TEXT = "Overview"; - - /** The Constant PAGE_VISIT_HISTORY_TEXT. */ - private static final String PAGE_VISIT_HISTORY_TEXT = "Page Visit History"; - - /** The Constant ROLE_GHANT_TEXT. */ - private static final String ROLE_GHANT_TEXT = "RoleGhant"; - - /** The Constant ROLES_TEXT. */ - private static final String ROLES_TEXT = "Roles"; - - /** The Constant CURRENT_MEMBERS_DESCRIPTION. */ - private static final String CURRENT_MEMBERS_DESCRIPTION = "Current roles and days served"; - - /** The Constant MEMBER_HISTORY_DESCRIPTION. */ - private static final String MEMBER_HISTORY_DESCRIPTION = "History of all roles and days served"; - - /** The Constant ROLE_GHANT_DESCRIPTION. */ - private static final String ROLE_GHANT_DESCRIPTION = "Gantt chart of all roles over time"; - - /** The Constant DOCUMENT_ACTIVITY_DESCRIPTION. */ - private static final String DOCUMENT_ACTIVITY_DESCRIPTION = "Chart of document activity by document type."; - - /** The Constant DOCUMENT_HISTORY_DESCRIPTION. */ - private static final String DOCUMENT_HISTORY_DESCRIPTION = "Document history list"; - - /** The Constant BALLOT_DECISION_SUMMARY_DESCRIPTION. */ - private static final String BALLOT_DECISION_SUMMARY_DESCRIPTION = "Summary of all ballot decisions"; - - /** The Constant DECISION_SUMMARY_DESCRIPTION. */ - private static final String DECISION_SUMMARY_DESCRIPTION = "Summary of all ballots"; - - /** The Constant DECISION_TYPE_DAILY_SUMMARY_DESCRIPTION. */ - private static final String DECISION_TYPE_DAILY_SUMMARY_DESCRIPTION = "Chart over decisions by decisions type, daily summary"; - - /** The Constant DECISION_FLOW_DESCRIPTION. */ - private static final String DECISION_FLOW_DESCRIPTION = "Decision flow chart"; - - /** The Constant PAGE_VISIT_HISTORY_DESCRIPTION. */ - private static final String PAGE_VISIT_HISTORY_DESCRIPTION = "View history of page visit for this page."; +public final class CommitteeMenuItemFactoryImpl extends AbstractMenuItemFactoryImpl + implements CommitteeMenuItemFactory { /** The application menu item factory. */ @Autowired @@ -127,7 +56,6 @@ public final class CommitteeMenuItemFactoryImpl extends AbstractMenuItemFactoryI @Autowired private CommitteeRankingMenuItemFactory committeeRankingMenuItemFactory; - /** * Instantiates a new committee menu item factory impl. */ @@ -141,10 +69,10 @@ public void createCommitteeeMenuBar(final MenuBar menuBar, final String pageId) applicationMenuItemFactory.addRankingMenu(menuBar); - committeeRankingMenuItemFactory.createCommitteeRankingTopics(menuBar.addItem(COMMITTEE_RANKING_TEXT, VaadinIcons.GROUP, null)); - - final MenuItem committeeItem = menuBar.addItem("Committee "+ pageId, VaadinIcons.GROUP,null); + committeeRankingMenuItemFactory + .createCommitteeRankingTopics(menuBar.addItem(COMMITTEE_RANKING_TEXT, VaadinIcons.GROUP, null)); + final MenuItem committeeItem = menuBar.addItem("Committee " + pageId, VaadinIcons.GROUP, null); committeeItem.addItem(OVERVIEW_TEXT, VaadinIcons.GROUP, new PageModeMenuCommand(UserViews.COMMITTEE_VIEW_NAME, PageMode.OVERVIEW, pageId)); @@ -154,34 +82,38 @@ public void createCommitteeeMenuBar(final MenuBar menuBar, final String pageId) rolesItem.addItem(CURRENT_MEMBERS_TEXT, VaadinIcons.USER, new PageModeMenuCommand(UserViews.COMMITTEE_VIEW_NAME, CommitteePageMode.CURRENT_MEMBERS.toString(), pageId)); - rolesItem.addItem(MEMBER_HISTORY_TEXT, VaadinIcons.CALENDAR_USER, new PageModeMenuCommand(UserViews.COMMITTEE_VIEW_NAME, - CommitteePageMode.MEMBERHISTORY.toString(), pageId)); + rolesItem.addItem(MEMBER_HISTORY_TEXT, VaadinIcons.CALENDAR_USER, + new PageModeMenuCommand(UserViews.COMMITTEE_VIEW_NAME, + CommitteePageMode.MEMBERHISTORY.toString(), pageId)); rolesItem.addItem(ROLE_GHANT_TEXT, VaadinIcons.LINE_CHART, new PageModeMenuCommand(UserViews.COMMITTEE_VIEW_NAME, CommitteePageMode.ROLEGHANT.toString(), pageId)); final MenuItem documentItem = committeeItem.addItem(DOCUMENTS_TEXT, VaadinIcons.FILE_TEXT, null); - documentItem.addItem(DOCUMENT_ACTIVITY_TEXT, VaadinIcons.FILE_PROCESS, new PageModeMenuCommand(UserViews.COMMITTEE_VIEW_NAME, - CommitteePageMode.DOCUMENTACTIVITY.toString(), pageId)); + documentItem.addItem(DOCUMENT_ACTIVITY_TEXT, VaadinIcons.FILE_PROCESS, + new PageModeMenuCommand(UserViews.COMMITTEE_VIEW_NAME, + CommitteePageMode.DOCUMENTACTIVITY.toString(), pageId)); - documentItem.addItem(DOCUMENT_HISTORY_TEXT, VaadinIcons.FILE_TREE, new PageModeMenuCommand(UserViews.COMMITTEE_VIEW_NAME, - CommitteePageMode.DOCUMENT_HISTORY.toString(), pageId)); + documentItem.addItem(DOCUMENT_HISTORY_TEXT, VaadinIcons.FILE_TREE, + new PageModeMenuCommand(UserViews.COMMITTEE_VIEW_NAME, + CommitteePageMode.DOCUMENT_HISTORY.toString(), pageId)); final MenuItem ballotItem = committeeItem.addItem(BALLOTS_TEXT, VaadinIcons.CLIPBOARD_TEXT, null); - ballotItem.addItem(BALLOT_DECISION_SUMMARY_TEXT, VaadinIcons.CLIPBOARD_CHECK, new PageModeMenuCommand(UserViews.COMMITTEE_VIEW_NAME, - CommitteePageMode.BALLOTDECISIONSUMMARY.toString(), pageId)); + ballotItem.addItem(BALLOT_DECISION_SUMMARY_TEXT, VaadinIcons.CLIPBOARD_CHECK, + new PageModeMenuCommand(UserViews.COMMITTEE_VIEW_NAME, + CommitteePageMode.BALLOTDECISIONSUMMARY.toString(), pageId)); - ballotItem.addItem(DECISION_SUMMARY_TEXT, VaadinIcons.CLIPBOARD_PULSE, new PageModeMenuCommand(UserViews.COMMITTEE_VIEW_NAME, - CommitteePageMode.DECISIONSUMMARY.toString(), pageId)); + ballotItem.addItem(DECISION_SUMMARY_TEXT, VaadinIcons.CLIPBOARD_PULSE, + new PageModeMenuCommand(UserViews.COMMITTEE_VIEW_NAME, + CommitteePageMode.DECISIONSUMMARY.toString(), pageId)); ballotItem.addItem(DECISION_TYPE_DAILY_SUMMARY_TEXT, VaadinIcons.CLIPBOARD_TEXT, new PageModeMenuCommand( UserViews.COMMITTEE_VIEW_NAME, CommitteePageMode.DECISIONTYPEDAILYSUMMARY.toString(), pageId)); ballotItem.addItem("Decision flow", VaadinIcons.LINE_CHART, new PageModeMenuCommand( - UserViews.COMMITTEE_VIEW_NAME, PageMode.CHARTS+"/"+ ChartIndicators.DECISION_FLOW_CHART, pageId)); - + UserViews.COMMITTEE_VIEW_NAME, PageMode.CHARTS + "/" + ChartIndicators.DECISION_FLOW_CHART, pageId)); committeeItem.addItem(PAGE_VISIT_HISTORY_TEXT, VaadinIcons.CLOCK, new PageModeMenuCommand(UserViews.COMMITTEE_VIEW_NAME, PageMode.PAGEVISITHISTORY, pageId)); @@ -192,41 +124,52 @@ public void createCommitteeeMenuBar(final MenuBar menuBar, final String pageId) public void createOverviewPage(final VerticalLayout panelContent, final String pageId) { final ResponsiveRow grid = RowUtil.createGridLayout(panelContent); - createButtonLink(grid,CURRENT_MEMBERS_TEXT, VaadinIcons.USER, new PageModeMenuCommand(UserViews.COMMITTEE_VIEW_NAME, - CommitteePageMode.CURRENT_MEMBERS.toString(), pageId), CURRENT_MEMBERS_DESCRIPTION); - - createButtonLink(grid,MEMBER_HISTORY_TEXT, VaadinIcons.CALENDAR_USER, new PageModeMenuCommand(UserViews.COMMITTEE_VIEW_NAME, - CommitteePageMode.MEMBERHISTORY.toString(), pageId), MEMBER_HISTORY_DESCRIPTION); + createButtonLink(grid, CURRENT_MEMBERS_TEXT, VaadinIcons.USER, + new PageModeMenuCommand(UserViews.COMMITTEE_VIEW_NAME, + CommitteePageMode.CURRENT_MEMBERS.toString(), pageId), + CURRENT_MEMBERS_DESCRIPTION); - createButtonLink(grid,ROLE_GHANT_TEXT, VaadinIcons.LINE_CHART, - new PageModeMenuCommand(UserViews.COMMITTEE_VIEW_NAME, CommitteePageMode.ROLEGHANT.toString(), pageId), ROLE_GHANT_DESCRIPTION); + createButtonLink(grid, MEMBER_HISTORY_TEXT, VaadinIcons.CALENDAR_USER, + new PageModeMenuCommand(UserViews.COMMITTEE_VIEW_NAME, + CommitteePageMode.MEMBERHISTORY.toString(), pageId), + MEMBER_HISTORY_DESCRIPTION); + createButtonLink(grid, ROLE_GHANT_TEXT, VaadinIcons.LINE_CHART, + new PageModeMenuCommand(UserViews.COMMITTEE_VIEW_NAME, CommitteePageMode.ROLEGHANT.toString(), pageId), + ROLE_GHANT_DESCRIPTION); - createButtonLink(grid,DOCUMENT_ACTIVITY_TEXT, VaadinIcons.FILE_PROCESS, new PageModeMenuCommand(UserViews.COMMITTEE_VIEW_NAME, - CommitteePageMode.DOCUMENTACTIVITY.toString(), pageId), DOCUMENT_ACTIVITY_DESCRIPTION); + createButtonLink(grid, DOCUMENT_ACTIVITY_TEXT, VaadinIcons.FILE_PROCESS, + new PageModeMenuCommand(UserViews.COMMITTEE_VIEW_NAME, + CommitteePageMode.DOCUMENTACTIVITY.toString(), pageId), + DOCUMENT_ACTIVITY_DESCRIPTION); - createButtonLink(grid,DOCUMENT_HISTORY_TEXT, VaadinIcons.FILE_TREE, new PageModeMenuCommand(UserViews.COMMITTEE_VIEW_NAME, - CommitteePageMode.DOCUMENT_HISTORY.toString(), pageId), DOCUMENT_HISTORY_DESCRIPTION); + createButtonLink(grid, DOCUMENT_HISTORY_TEXT, VaadinIcons.FILE_TREE, + new PageModeMenuCommand(UserViews.COMMITTEE_VIEW_NAME, + CommitteePageMode.DOCUMENT_HISTORY.toString(), pageId), + DOCUMENT_HISTORY_DESCRIPTION); + createButtonLink(grid, BALLOT_DECISION_SUMMARY_TEXT, VaadinIcons.CLIPBOARD_CHECK, + new PageModeMenuCommand(UserViews.COMMITTEE_VIEW_NAME, + CommitteePageMode.BALLOTDECISIONSUMMARY.toString(), pageId), + BALLOT_DECISION_SUMMARY_DESCRIPTION); - createButtonLink(grid,BALLOT_DECISION_SUMMARY_TEXT, VaadinIcons.CLIPBOARD_CHECK, new PageModeMenuCommand(UserViews.COMMITTEE_VIEW_NAME, - CommitteePageMode.BALLOTDECISIONSUMMARY.toString(), pageId), BALLOT_DECISION_SUMMARY_DESCRIPTION); + createButtonLink(grid, DECISION_SUMMARY_TEXT, VaadinIcons.CLIPBOARD_PULSE, + new PageModeMenuCommand(UserViews.COMMITTEE_VIEW_NAME, + CommitteePageMode.DECISIONSUMMARY.toString(), pageId), + DECISION_SUMMARY_DESCRIPTION); - createButtonLink(grid,DECISION_SUMMARY_TEXT, VaadinIcons.CLIPBOARD_PULSE, new PageModeMenuCommand(UserViews.COMMITTEE_VIEW_NAME, - CommitteePageMode.DECISIONSUMMARY.toString(), pageId), DECISION_SUMMARY_DESCRIPTION); + createButtonLink(grid, DECISION_TYPE_DAILY_SUMMARY_TEXT, VaadinIcons.CLIPBOARD_TEXT, new PageModeMenuCommand( + UserViews.COMMITTEE_VIEW_NAME, CommitteePageMode.DECISIONTYPEDAILYSUMMARY.toString(), pageId), + DECISION_TYPE_DAILY_SUMMARY_DESCRIPTION); - createButtonLink(grid,DECISION_TYPE_DAILY_SUMMARY_TEXT, VaadinIcons.CLIPBOARD_TEXT, new PageModeMenuCommand( - UserViews.COMMITTEE_VIEW_NAME, CommitteePageMode.DECISIONTYPEDAILYSUMMARY.toString(), pageId), DECISION_TYPE_DAILY_SUMMARY_DESCRIPTION); - - createButtonLink(grid,"Decision flow", VaadinIcons.LINE_CHART, new PageModeMenuCommand( - UserViews.COMMITTEE_VIEW_NAME, PageMode.CHARTS+"/"+ ChartIndicators.DECISION_FLOW_CHART, pageId), DECISION_FLOW_DESCRIPTION); - - - createButtonLink(grid,PAGE_VISIT_HISTORY_TEXT, VaadinIcons.CLOCK, - new PageModeMenuCommand(UserViews.COMMITTEE_VIEW_NAME, PageMode.PAGEVISITHISTORY, pageId), PAGE_VISIT_HISTORY_DESCRIPTION); + createButtonLink(grid, "Decision flow", VaadinIcons.LINE_CHART, new PageModeMenuCommand( + UserViews.COMMITTEE_VIEW_NAME, PageMode.CHARTS + "/" + ChartIndicators.DECISION_FLOW_CHART, pageId), + DECISION_FLOW_DESCRIPTION); + createButtonLink(grid, PAGE_VISIT_HISTORY_TEXT, VaadinIcons.CLOCK, + new PageModeMenuCommand(UserViews.COMMITTEE_VIEW_NAME, PageMode.PAGEVISITHISTORY, pageId), + PAGE_VISIT_HISTORY_DESCRIPTION); } - } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/CommitteeRankingMenuItemFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/CommitteeRankingMenuItemFactoryImpl.java index 46c7aaaf3d..27a39940be 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/CommitteeRankingMenuItemFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/CommitteeRankingMenuItemFactoryImpl.java @@ -23,11 +23,7 @@ import com.hack23.cia.web.impl.ui.application.views.common.menufactory.api.ApplicationMenuItemFactory; import com.hack23.cia.web.impl.ui.application.views.common.menufactory.api.CommitteeRankingMenuItemFactory; -import com.hack23.cia.web.impl.ui.application.views.common.pagelinks.api.PageModeMenuCommand; import com.hack23.cia.web.impl.ui.application.views.common.rows.RowUtil; -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; import com.jarektoro.responsivelayout.ResponsiveRow; import com.vaadin.icons.VaadinIcons; import com.vaadin.ui.MenuBar; @@ -41,88 +37,6 @@ public final class CommitteeRankingMenuItemFactoryImpl extends AbstractMenuItemFactoryImpl implements CommitteeRankingMenuItemFactory { - /** The Constant ALL_COMMITTEES_TOTAL_MEMBERS. */ - private static final String ALL_COMMITTEES_TOTAL_MEMBERS = "All committees, total members"; - - /** The Constant CHART_BY_TOPIC_TEXT. */ - private static final String CHART_BY_TOPIC_TEXT = "Chart by topic"; - - /** The Constant COMMAND_ALL_COMMITTEES_BY_HEADCOUNT. */ - private static final PageModeMenuCommand COMMAND_ALL_COMMITTEES_BY_HEADCOUNT = new PageModeMenuCommand(UserViews.COMMITTEE_RANKING_VIEW_NAME, - PageMode.CHARTS,ChartIndicators.ALLCOMMITTEESBYHEADCOUNT.toString()); - - /** The Constant COMMAND_COMMITTEES_BY_PARTY. */ - private static final PageModeMenuCommand COMMAND_COMMITTEES_BY_PARTY = new PageModeMenuCommand(UserViews.COMMITTEE_RANKING_VIEW_NAME, - PageMode.CHARTS,ChartIndicators.COMMITTEESBYPARTY.toString()); - - /** The Constant COMMAND_CURRENT_COMMITTEES_BY_HEADCOUNT. */ - private static final PageModeMenuCommand COMMAND_CURRENT_COMMITTEES_BY_HEADCOUNT = new PageModeMenuCommand(UserViews.COMMITTEE_RANKING_VIEW_NAME, - PageMode.CHARTS,ChartIndicators.CURRENTCOMMITTEESBYHEADCOUNT.toString()); - - - /** The Constant COMMAND_CURRENT_COMMITTEES_BY_PARTY_HEADCOUNT. */ - private static final PageModeMenuCommand COMMAND_CURRENT_COMMITTEES_BY_PARTY_DAYS_SERVED = new PageModeMenuCommand(UserViews.COMMITTEE_RANKING_VIEW_NAME, - PageMode.CHARTS,ChartIndicators.CURRENTCOMMITTEESBYPARTYDAYSSERVED.toString()); - - /** The Constant COMMAND_DATAGRID. */ - private static final PageModeMenuCommand COMMAND_DATAGRID = new PageModeMenuCommand(UserViews.COMMITTEE_RANKING_VIEW_NAME, - PageMode.DATAGRID); - - /** The Constant COMMAND_OVERVIEW. */ - private static final PageModeMenuCommand COMMAND_OVERVIEW = new PageModeMenuCommand(UserViews.COMMITTEE_RANKING_VIEW_NAME, - PageMode.OVERVIEW); - - /** The Constant COMMAND_PAGEVISIT_HISTORY. */ - private static final PageModeMenuCommand COMMAND_PAGEVISIT_HISTORY = new PageModeMenuCommand(UserViews.COMMITTEE_RANKING_VIEW_NAME, - PageMode.PAGEVISITHISTORY); - - /** The Constant COMMITTEE_RANKING_TEXT. */ - private static final String COMMITTEE_RANKING_TEXT = "Committee Ranking"; - - /** The Constant CURRENT_AND_PAST_MEMBER_AND_SUMMARY_OF_POLTICIAL_DAYS. */ - private static final String CURRENT_AND_PAST_MEMBER_AND_SUMMARY_OF_POLTICIAL_DAYS = "Current and past member, polticial days"; - - /** The Constant CURRENT_COMMITTEES_CURRENT_MEMBERS_TEXT. */ - private static final String CURRENT_COMMITTEES_CURRENT_MEMBERS_TEXT = "Current committees, current members"; - - /** - * The Constant CURRENT_PARTIES_ACTIVE_IN_COMMITTEES_CURRENT_ASSIGNMENTS. - */ - private static final String CURRENT_PARTIES_ACTIVE_IN_COMMITTEES_CURRENT_ASSIGNMENTS = "Current parties in committees"; - - /** - * The Constant - * CURRENT_PARTIES_ACTIVE_IN_COMMITTEES_TOTAL_DAYS_SERVED_IN_COMMITTEES. - */ - private static final String CURRENT_PARTIES_ACTIVE_IN_COMMITTEES_TOTAL_DAYS_SERVED_IN_COMMITTEES = "Current parties,days served"; - - /** The Constant OVERVIEW_TEXT. */ - private static final String OVERVIEW_TEXT = "Overview"; - - /** The Constant PAGE_VISIT_HISTORY_TEXT. */ - private static final String PAGE_VISIT_HISTORY_TEXT = "Page Visit History"; - - /** The Constant POLITICAL_WORK_SUMMARY_TEXT. */ - private static final String POLITICAL_WORK_SUMMARY_TEXT = "Political Work Summary"; - - /** The Constant POLITICAL_WORK_SUMMARY_DESCRIPTION. */ - private static final String POLITICAL_WORK_SUMMARY_DESCRIPTION = "Scoreboard over current member size, political days served and total assignments"; - - /** The Constant CURRENT_COMMITTEES_CURRENT_MEMBERS_DESCRIPTION. */ - private static final String CURRENT_COMMITTEES_CURRENT_MEMBERS_DESCRIPTION = "Chart over current committees and member size"; - - /** The Constant CURRENT_PARTIES_ACTIVE_IN_COMMITTEES_CURRENT_ASSIGNMENTS_DESCRIPTION. */ - private static final String CURRENT_PARTIES_ACTIVE_IN_COMMITTEES_CURRENT_ASSIGNMENTS_DESCRIPTION = "Chart over current parties active in committees and member size"; - - /** The Constant CURRENT_PARTIES_ACTIVE_IN_COMMITTEES_TOTAL_DAYS_SERVED_IN_COMMITTEES_DESCRIPTION. */ - private static final String CURRENT_PARTIES_ACTIVE_IN_COMMITTEES_TOTAL_DAYS_SERVED_IN_COMMITTEES_DESCRIPTION = "Chart over current parties active in committees days served"; - - /** The Constant ALL_COMMITTEES_TOTAL_MEMBERS_DESCRIPTION. */ - private static final String ALL_COMMITTEES_TOTAL_MEMBERS_DESCRIPTION = "Chart over all committees and member size"; - - /** The Constant PAGE_VISIT_HISTORY_DESCRIPTION. */ - private static final String PAGE_VISIT_HISTORY_DESCRIPTION = "View history of page visit for this page."; - /** The application menu item factory. */ @Autowired private ApplicationMenuItemFactory applicationMenuItemFactory; @@ -138,7 +52,7 @@ public CommitteeRankingMenuItemFactoryImpl() { * Creates the committeee ranking menu bar. * * @param menuBar - * the menu bar + * the menu bar */ @Override public void createCommitteeeRankingMenuBar(final MenuBar menuBar) { @@ -153,23 +67,26 @@ public void createCommitteeeRankingMenuBar(final MenuBar menuBar) { * Creates the committee ranking topics. * * @param committeeMenuItem - * the committee menu item + * the committee menu item */ @Override public void createCommitteeRankingTopics(final MenuItem committeeMenuItem) { committeeMenuItem.addItem(OVERVIEW_TEXT, VaadinIcons.GROUP, COMMAND_OVERVIEW); - final MenuItem listItem = committeeMenuItem.addItem(POLITICAL_WORK_SUMMARY_TEXT,VaadinIcons.GROUP, COMMAND_DATAGRID); + final MenuItem listItem = committeeMenuItem.addItem(POLITICAL_WORK_SUMMARY_TEXT, VaadinIcons.GROUP, + COMMAND_DATAGRID); listItem.setDescription(CURRENT_AND_PAST_MEMBER_AND_SUMMARY_OF_POLTICIAL_DAYS); final MenuItem chartByTopic = committeeMenuItem.addItem(CHART_BY_TOPIC_TEXT, VaadinIcons.GROUP, null); + chartByTopic.addItem(CURRENT_COMMITTEES_CURRENT_MEMBERS_TEXT, VaadinIcons.GROUP, + COMMAND_CURRENT_COMMITTEES_BY_HEADCOUNT); + chartByTopic.addItem(CURRENT_PARTIES_ACTIVE_IN_COMMITTEES_CURRENT_ASSIGNMENTS, VaadinIcons.GROUP, + COMMAND_COMMITTEES_BY_PARTY); + chartByTopic.addItem(CURRENT_PARTIES_ACTIVE_IN_COMMITTEES_TOTAL_DAYS_SERVED_IN_COMMITTEES, VaadinIcons.GROUP, + COMMAND_CURRENT_COMMITTEES_BY_PARTY_DAYS_SERVED); - chartByTopic.addItem(CURRENT_COMMITTEES_CURRENT_MEMBERS_TEXT,VaadinIcons.GROUP, COMMAND_CURRENT_COMMITTEES_BY_HEADCOUNT); - chartByTopic.addItem(CURRENT_PARTIES_ACTIVE_IN_COMMITTEES_CURRENT_ASSIGNMENTS,VaadinIcons.GROUP, COMMAND_COMMITTEES_BY_PARTY); - chartByTopic.addItem(CURRENT_PARTIES_ACTIVE_IN_COMMITTEES_TOTAL_DAYS_SERVED_IN_COMMITTEES,VaadinIcons.GROUP, COMMAND_CURRENT_COMMITTEES_BY_PARTY_DAYS_SERVED); - - chartByTopic.addItem(ALL_COMMITTEES_TOTAL_MEMBERS,VaadinIcons.GROUP, COMMAND_ALL_COMMITTEES_BY_HEADCOUNT); + chartByTopic.addItem(ALL_COMMITTEES_TOTAL_MEMBERS, VaadinIcons.GROUP, COMMAND_ALL_COMMITTEES_BY_HEADCOUNT); committeeMenuItem.addItem(PAGE_VISIT_HISTORY_TEXT, VaadinIcons.GROUP, COMMAND_PAGEVISIT_HISTORY); @@ -179,23 +96,28 @@ public void createCommitteeRankingTopics(final MenuItem committeeMenuItem) { * Creates the overview page. * * @param panelContent - * the panel content + * the panel content */ @Override public void createOverviewPage(final VerticalLayout panelContent) { final ResponsiveRow grid = RowUtil.createGridLayout(panelContent); + createButtonLink(grid, POLITICAL_WORK_SUMMARY_TEXT, VaadinIcons.GROUP, COMMAND_DATAGRID, + POLITICAL_WORK_SUMMARY_DESCRIPTION); + createButtonLink(grid, CURRENT_COMMITTEES_CURRENT_MEMBERS_TEXT, VaadinIcons.GROUP, + COMMAND_CURRENT_COMMITTEES_BY_HEADCOUNT, CURRENT_COMMITTEES_CURRENT_MEMBERS_DESCRIPTION); - createButtonLink(grid,POLITICAL_WORK_SUMMARY_TEXT,VaadinIcons.GROUP, COMMAND_DATAGRID, POLITICAL_WORK_SUMMARY_DESCRIPTION); - createButtonLink(grid,CURRENT_COMMITTEES_CURRENT_MEMBERS_TEXT,VaadinIcons.GROUP, COMMAND_CURRENT_COMMITTEES_BY_HEADCOUNT, CURRENT_COMMITTEES_CURRENT_MEMBERS_DESCRIPTION); - - createButtonLink(grid,CURRENT_PARTIES_ACTIVE_IN_COMMITTEES_CURRENT_ASSIGNMENTS,VaadinIcons.GROUP, COMMAND_COMMITTEES_BY_PARTY, CURRENT_PARTIES_ACTIVE_IN_COMMITTEES_CURRENT_ASSIGNMENTS_DESCRIPTION); - createButtonLink(grid,CURRENT_PARTIES_ACTIVE_IN_COMMITTEES_TOTAL_DAYS_SERVED_IN_COMMITTEES,VaadinIcons.GROUP, COMMAND_CURRENT_COMMITTEES_BY_PARTY_DAYS_SERVED, CURRENT_PARTIES_ACTIVE_IN_COMMITTEES_TOTAL_DAYS_SERVED_IN_COMMITTEES_DESCRIPTION); - createButtonLink(grid,ALL_COMMITTEES_TOTAL_MEMBERS,VaadinIcons.GROUP, COMMAND_ALL_COMMITTEES_BY_HEADCOUNT, ALL_COMMITTEES_TOTAL_MEMBERS_DESCRIPTION); + createButtonLink(grid, CURRENT_PARTIES_ACTIVE_IN_COMMITTEES_CURRENT_ASSIGNMENTS, VaadinIcons.GROUP, + COMMAND_COMMITTEES_BY_PARTY, CURRENT_PARTIES_ACTIVE_IN_COMMITTEES_CURRENT_ASSIGNMENTS_DESCRIPTION); + createButtonLink(grid, CURRENT_PARTIES_ACTIVE_IN_COMMITTEES_TOTAL_DAYS_SERVED_IN_COMMITTEES, VaadinIcons.GROUP, + COMMAND_CURRENT_COMMITTEES_BY_PARTY_DAYS_SERVED, + CURRENT_PARTIES_ACTIVE_IN_COMMITTEES_TOTAL_DAYS_SERVED_IN_COMMITTEES_DESCRIPTION); + createButtonLink(grid, ALL_COMMITTEES_TOTAL_MEMBERS, VaadinIcons.GROUP, COMMAND_ALL_COMMITTEES_BY_HEADCOUNT, + ALL_COMMITTEES_TOTAL_MEMBERS_DESCRIPTION); - createButtonLink(grid,PAGE_VISIT_HISTORY_TEXT, VaadinIcons.GROUP, COMMAND_PAGEVISIT_HISTORY, PAGE_VISIT_HISTORY_DESCRIPTION); + createButtonLink(grid, PAGE_VISIT_HISTORY_TEXT, VaadinIcons.GROUP, COMMAND_PAGEVISIT_HISTORY, + PAGE_VISIT_HISTORY_DESCRIPTION); } - } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/CountryMenuItemFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/CountryMenuItemFactoryImpl.java index d4a48a6f9b..871ac162c9 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/CountryMenuItemFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/CountryMenuItemFactoryImpl.java @@ -54,34 +54,6 @@ @Service public final class CountryMenuItemFactoryImpl extends AbstractMenuItemFactoryImpl implements CountryMenuItemFactory { - /** The Constant COMMAND_OVERVIEW. */ - private static final PageModeMenuCommand COMMAND_OVERVIEW = new PageModeMenuCommand(UserViews.COUNTRY_RANKING_VIEW_NAME, PageMode.OVERVIEW); - - /** The Constant COMMAND_PAGEVISITHISTORY. */ - private static final PageModeMenuCommand COMMAND_PAGEVISITHISTORY = new PageModeMenuCommand(UserViews.COUNTRY_RANKING_VIEW_NAME, PageMode.PAGEVISITHISTORY); - - /** The Constant COUNTRY_INDICATORS_SWEDEN. */ - private static final String COUNTRY_INDICATORS_SWEDEN = "Country Indicators, Sweden"; - - - /** The Constant COUNTRY_RANKING_TEXT. */ - private static final String COUNTRY_RANKING_TEXT = "Counry Ranking"; - - /** The Constant DATA_POINTS_FOR_YEAR_ABOVE. */ - private static final int DATA_POINTS_FOR_YEAR_ABOVE = 2010; - - /** The Constant MINIMUM_NUMBER_DATA_POINTS. */ - private static final int MINIMUM_NUMBER_DATA_POINTS = 10; - - /** The Constant OVERVIEW_TEXT. */ - private static final String OVERVIEW_TEXT = "Overview"; - - /** The Constant PAGE_VISIT_HISTORY_TEXT. */ - private static final String PAGE_VISIT_HISTORY_TEXT = "Page Visit History"; - - /** The Constant BY_TOPIC. */ - private static final String BY_TOPIC = "By Topic"; - /** The application manager. */ @Autowired private ApplicationManager applicationManager; @@ -101,9 +73,9 @@ public CountryMenuItemFactoryImpl() { * Adds the sources and indicators to menu. * * @param countryIndicators - * the country indicators + * the country indicators * @param sourceIndicatorMap - * the source indicator map + * the source indicator map */ private static void addSourcesAndIndicatorsToMenu(final MenuItem countryIndicators, final Map> sourceIndicatorMap) { @@ -137,21 +109,20 @@ public void createCountryTopicMenu(final MenuBar menuBar) { applicationMenuItemFactory.addRankingMenu(menuBar); - - createCountryTopicMenu( menuBar.addItem(COUNTRY_RANKING_TEXT, VaadinIcons.FLAG, null)); + createCountryTopicMenu(menuBar.addItem(COUNTRY_RANKING_TEXT, VaadinIcons.FLAG, null)); } @Override public void createCountryTopicMenu(final MenuItem charts) { - charts.addItem(OVERVIEW_TEXT, VaadinIcons.LINE_CHART, - COMMAND_OVERVIEW); + charts.addItem(COUNTRY_OVERVIEW_TEXT, VaadinIcons.LINE_CHART, + COUNTRY_COMMAND_OVERVIEW); final MenuItem countryIndicators = charts.addItem(COUNTRY_INDICATORS_SWEDEN, VaadinIcons.LINE_CHART, null); addSourcesAndIndicatorsToMenu(countryIndicators, getTopicIndicatorMap()); - charts.addItem(PAGE_VISIT_HISTORY_TEXT, VaadinIcons.LINE_CHART, COMMAND_PAGEVISITHISTORY); + charts.addItem(COUNTRY_PAGE_VISIT_HISTORY_TEXT, VaadinIcons.LINE_CHART, COUNTRY_COMMAND_PAGEVISITHISTORY); } @@ -162,7 +133,7 @@ public void createOverviewPage(final VerticalLayout panelContent) { panelContent.setComponentAlignment(menuBar, Alignment.TOP_LEFT); panelContent.setExpandRatio(menuBar, ContentRatio.LARGE); - addSourcesAndIndicatorsToMenu(menuBar.addItem(BY_TOPIC,VaadinIcons.LINE_CHART, null), getTopicIndicatorMap()); + addSourcesAndIndicatorsToMenu(menuBar.addItem(BY_TOPIC, VaadinIcons.LINE_CHART, null), getTopicIndicatorMap()); menuBar.setAutoOpen(true); } @@ -176,8 +147,13 @@ private Map> getTopicIndi .getDataContainer(ViewWorldbankIndicatorDataCountrySummary.class); return indicatorDataCountrSummaryDailyDataContainer - .findListByEmbeddedProperty(ViewWorldbankIndicatorDataCountrySummary.class,ViewWorldbankIndicatorDataCountrySummary_.embeddedId,WorldbankIndicatorDataCountrySummaryEmbeddedId.class,WorldbankIndicatorDataCountrySummaryEmbeddedId_.countryId,"SE").parallelStream() - .filter(t -> t != null && t.getSourceValue() != null && t.getEndYear() > DATA_POINTS_FOR_YEAR_ABOVE && t.getDataPoint() > MINIMUM_NUMBER_DATA_POINTS) + .findListByEmbeddedProperty(ViewWorldbankIndicatorDataCountrySummary.class, + ViewWorldbankIndicatorDataCountrySummary_.embeddedId, + WorldbankIndicatorDataCountrySummaryEmbeddedId.class, + WorldbankIndicatorDataCountrySummaryEmbeddedId_.countryId, "SE") + .parallelStream() + .filter(t -> t != null && t.getSourceValue() != null && t.getEndYear() > DATA_POINTS_FOR_YEAR_ABOVE + && t.getDataPoint() > MINIMUM_NUMBER_DATA_POINTS) .flatMap(t -> Arrays.asList(t.getTopics().split(";")).stream() .map(topic -> new AbstractMap.SimpleEntry<>(topic, t))) diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/DocumentMenuItemFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/DocumentMenuItemFactoryImpl.java index e69165cb0c..25a6478b1b 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/DocumentMenuItemFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/DocumentMenuItemFactoryImpl.java @@ -40,73 +40,6 @@ @Service public final class DocumentMenuItemFactoryImpl extends AbstractMenuItemFactoryImpl implements DocumentMenuItemFactory { - /** The Constant COMMAND_DOCUMENTS. */ - private static final PageModeMenuCommand COMMAND_DOCUMENTS = new PageModeMenuCommand(UserViews.DOCUMENTS_VIEW_NAME,PageMode.OVERVIEW); - - /** The Constant COMMAND_SEARCH_DOCUMENT. */ - private static final PageModeMenuCommand COMMAND_SEARCH_DOCUMENT = new PageModeMenuCommand(UserViews.SEARCH_DOCUMENT_VIEW_NAME,""); - - /** The Constant DOCUMENT. */ - private static final String DOCUMENT = "Document"; - - /** The Constant DOCUMENT_ACTIVITY_TEXT. */ - private static final String DOCUMENT_ACTIVITY_TEXT = "Document Activity"; - - /** The Constant DOCUMENT_ATTACHEMENTS. */ - private static final String DOCUMENT_ATTACHEMENTS = "Document Attachements"; - - /** The Constant DOCUMENT_DATA. */ - private static final String DOCUMENT_DATA = "Document data"; - - /** The Constant DOCUMENT_DECISION. */ - private static final String DOCUMENT_DECISION = "Document Decision"; - - - /** The Constant DOCUMENT_DETAILS. */ - private static final String DOCUMENT_DETAILS = "Document details"; - - /** The Constant DOCUMENT_REFERENCES. */ - private static final String DOCUMENT_REFERENCES = "Document References"; - - /** The Constant DOCUMENTS. */ - private static final String DOCUMENTS = "Documents"; - - /** The Constant OVERVIEW_TEXT. */ - private static final String OVERVIEW_TEXT = "Overview"; - - /** The Constant PAGE_VISIT_HISTORY_TEXT. */ - private static final String PAGE_VISIT_HISTORY_TEXT = "Page Visit History"; - - /** The Constant PERSON_REFERENCES. */ - private static final String PERSON_REFERENCES = "Person references"; - - /** The Constant LIST_ALL. */ - private static final String LIST_ALL = "List all"; - - /** The Constant SEARCH_DOCUMENTS. */ - private static final String SEARCH_DOCUMENTS = "Search Documents"; - - /** The Constant DOCUMENT_ACTIVITIES_AND_UPDATES. */ - private static final String DOCUMENT_ACTIVITIES_AND_UPDATES = "Document activities and updates."; - - /** The Constant REFERENCES_TO_INDIVIDUALS_IN_THE_DOCUMENT. */ - private static final String REFERENCES_TO_INDIVIDUALS_IN_THE_DOCUMENT = "References to individuals in the document."; - - /** The Constant DETAILED_INFORMATION_ABOUT_THE_DOCUMENT. */ - private static final String DETAILED_INFORMATION_ABOUT_THE_DOCUMENT = "Detailed information about the document."; - - /** The Constant COMPLETE_DOCUMENT_TEXT_AND_DATA. */ - private static final String COMPLETE_DOCUMENT_TEXT_AND_DATA = "Complete document text and data."; - - /** The Constant REFERENCES_CITED_IN_THE_DOCUMENT. */ - private static final String REFERENCES_CITED_IN_THE_DOCUMENT = "References cited in the document."; - - /** The Constant DECISIONS_AND_OUTCOMES_RELATED_TO_THE_DOCUMENT. */ - private static final String DECISIONS_AND_OUTCOMES_RELATED_TO_THE_DOCUMENT = "Decisions and outcomes related to the document."; - - /** The Constant ATTACHMENTS_AND_SUPPLEMENTARY_FILES. */ - private static final String ATTACHMENTS_AND_SUPPLEMENTARY_FILES = "Attachments and supplementary files."; - /** The application menu item factory. */ @Autowired private ApplicationMenuItemFactory applicationMenuItemFactory; @@ -118,80 +51,95 @@ public DocumentMenuItemFactoryImpl() { super(); } - @Override public void createDocumentMenuBar(final MenuBar menuBar, final String pageId) { - createDocumentsMenuBar(menuBar); - - final MenuItem documentItem = menuBar.addItem(DOCUMENT, VaadinIcons.FILE_TEXT, null); + createDocumentsMenuBar(menuBar); - documentItem.addItem(OVERVIEW_TEXT, VaadinIcons.FILE_TEXT, - new PageModeMenuCommand(UserViews.DOCUMENT_VIEW_NAME, PageMode.OVERVIEW, pageId)); + final MenuItem documentItem = menuBar.addItem(DOCUMENT, VaadinIcons.FILE_TEXT, null); - documentItem.addItem(DOCUMENT_ACTIVITY_TEXT, VaadinIcons.FILE_PROCESS, new PageModeMenuCommand(UserViews.DOCUMENT_VIEW_NAME, - DocumentPageMode.DOCUMENTACTIVITY.toString(), pageId)); + documentItem.addItem(DOCUMENT_OVERVIEW_TEXT, VaadinIcons.FILE_TEXT, + new PageModeMenuCommand(UserViews.DOCUMENT_VIEW_NAME, PageMode.OVERVIEW, pageId)); - documentItem.addItem(PERSON_REFERENCES, VaadinIcons.USER, new PageModeMenuCommand(UserViews.DOCUMENT_VIEW_NAME, - DocumentPageMode.PERSONREFERENCES.toString(), pageId)); + documentItem.addItem(DOCUMENT_ACTIVITY_TEXT, VaadinIcons.FILE_PROCESS, + new PageModeMenuCommand(UserViews.DOCUMENT_VIEW_NAME, + DocumentPageMode.DOCUMENTACTIVITY.toString(), pageId)); - documentItem.addItem(DOCUMENT_DETAILS, VaadinIcons.FILE_TEXT, new PageModeMenuCommand(UserViews.DOCUMENT_VIEW_NAME, - DocumentPageMode.DOCUMENTDETAILS.toString(), pageId)); + documentItem.addItem(PERSON_REFERENCES, VaadinIcons.USER, new PageModeMenuCommand(UserViews.DOCUMENT_VIEW_NAME, + DocumentPageMode.PERSONREFERENCES.toString(), pageId)); - documentItem.addItem(DOCUMENT_DATA, VaadinIcons.FILE_TEXT, new PageModeMenuCommand(UserViews.DOCUMENT_VIEW_NAME, - DocumentPageMode.DOCUMENTDATA.toString(), pageId)); + documentItem.addItem(DOCUMENT_DETAILS, VaadinIcons.FILE_TEXT, + new PageModeMenuCommand(UserViews.DOCUMENT_VIEW_NAME, + DocumentPageMode.DOCUMENTDETAILS.toString(), pageId)); - documentItem.addItem(DOCUMENT_REFERENCES, VaadinIcons.FILE_TREE, new PageModeMenuCommand(UserViews.DOCUMENT_VIEW_NAME, - DocumentPageMode.DOCUMENTREFERENCES.toString(), pageId)); + documentItem.addItem(DOCUMENT_DATA, VaadinIcons.FILE_TEXT, new PageModeMenuCommand(UserViews.DOCUMENT_VIEW_NAME, + DocumentPageMode.DOCUMENTDATA.toString(), pageId)); - documentItem.addItem(DOCUMENT_DECISION, VaadinIcons.CLIPBOARD_CHECK, new PageModeMenuCommand(UserViews.DOCUMENT_VIEW_NAME, - DocumentPageMode.DOCUMENTDECISION.toString(), pageId)); + documentItem.addItem(DOCUMENT_REFERENCES, VaadinIcons.FILE_TREE, + new PageModeMenuCommand(UserViews.DOCUMENT_VIEW_NAME, + DocumentPageMode.DOCUMENTREFERENCES.toString(), pageId)); - documentItem.addItem(DOCUMENT_ATTACHEMENTS, VaadinIcons.PAPERCLIP, new PageModeMenuCommand(UserViews.DOCUMENT_VIEW_NAME, - DocumentPageMode.DOCUMENTATTACHMENTS.toString(), pageId)); + documentItem.addItem(DOCUMENT_DECISION, VaadinIcons.CLIPBOARD_CHECK, + new PageModeMenuCommand(UserViews.DOCUMENT_VIEW_NAME, + DocumentPageMode.DOCUMENTDECISION.toString(), pageId)); + documentItem.addItem(DOCUMENT_ATTACHEMENTS, VaadinIcons.PAPERCLIP, + new PageModeMenuCommand(UserViews.DOCUMENT_VIEW_NAME, + DocumentPageMode.DOCUMENTATTACHMENTS.toString(), pageId)); - documentItem.addItem(PAGE_VISIT_HISTORY_TEXT, VaadinIcons.CLOCK, - new PageModeMenuCommand(UserViews.DOCUMENT_VIEW_NAME, PageMode.PAGEVISITHISTORY,pageId)); + documentItem.addItem(DOCUMENT_PAGE_VISIT_HISTORY_TEXT, VaadinIcons.CLOCK, + new PageModeMenuCommand(UserViews.DOCUMENT_VIEW_NAME, PageMode.PAGEVISITHISTORY, pageId)); } - @Override public void createDocumentsMenuBar(final MenuBar menuBar) { initApplicationMenuBar(menuBar); applicationMenuItemFactory.addRankingMenu(menuBar); final MenuItem documentsItem = menuBar.addItem(DOCUMENTS, VaadinIcons.FILE_TEXT, null); - documentsItem.addItem(LIST_ALL,VaadinIcons.FILE_TEXT, COMMAND_DOCUMENTS); - documentsItem.addItem(SEARCH_DOCUMENTS,VaadinIcons.SEARCH, COMMAND_SEARCH_DOCUMENT); + documentsItem.addItem(LIST_ALL, VaadinIcons.FILE_TEXT, COMMAND_DOCUMENTS); + documentsItem.addItem(SEARCH_DOCUMENTS, VaadinIcons.SEARCH, COMMAND_SEARCH_DOCUMENT); } - @Override public void createOverviewPage(final VerticalLayout panelContent, final String pageId) { final ResponsiveRow grid = RowUtil.createGridLayout(panelContent); - createButtonLink(grid,DOCUMENT_ACTIVITY_TEXT, VaadinIcons.FILE_PROCESS, new PageModeMenuCommand(UserViews.DOCUMENT_VIEW_NAME, - DocumentPageMode.DOCUMENTACTIVITY.toString(), pageId), DOCUMENT_ACTIVITIES_AND_UPDATES); - - createButtonLink(grid,PERSON_REFERENCES, VaadinIcons.USER, new PageModeMenuCommand(UserViews.DOCUMENT_VIEW_NAME, - DocumentPageMode.PERSONREFERENCES.toString(), pageId), REFERENCES_TO_INDIVIDUALS_IN_THE_DOCUMENT); - - createButtonLink(grid,DOCUMENT_DETAILS, VaadinIcons.FILE_TEXT, new PageModeMenuCommand(UserViews.DOCUMENT_VIEW_NAME, - DocumentPageMode.DOCUMENTDETAILS.toString(), pageId), DETAILED_INFORMATION_ABOUT_THE_DOCUMENT); - - createButtonLink(grid,DOCUMENT_DATA, VaadinIcons.FILE_TEXT, new PageModeMenuCommand(UserViews.DOCUMENT_VIEW_NAME, - DocumentPageMode.DOCUMENTDATA.toString(), pageId), COMPLETE_DOCUMENT_TEXT_AND_DATA); - - createButtonLink(grid,DOCUMENT_REFERENCES, VaadinIcons.FILE_TREE, new PageModeMenuCommand(UserViews.DOCUMENT_VIEW_NAME, - DocumentPageMode.DOCUMENTREFERENCES.toString(), pageId), REFERENCES_CITED_IN_THE_DOCUMENT); - - createButtonLink(grid,DOCUMENT_DECISION, VaadinIcons.CLIPBOARD_CHECK, new PageModeMenuCommand(UserViews.DOCUMENT_VIEW_NAME, - DocumentPageMode.DOCUMENTDECISION.toString(), pageId), DECISIONS_AND_OUTCOMES_RELATED_TO_THE_DOCUMENT); - - createButtonLink(grid,DOCUMENT_ATTACHEMENTS, VaadinIcons.PAPERCLIP, new PageModeMenuCommand(UserViews.DOCUMENT_VIEW_NAME, - DocumentPageMode.DOCUMENTATTACHMENTS.toString(), pageId), ATTACHMENTS_AND_SUPPLEMENTARY_FILES); + createButtonLink(grid, DOCUMENT_ACTIVITY_TEXT, VaadinIcons.FILE_PROCESS, + new PageModeMenuCommand(UserViews.DOCUMENT_VIEW_NAME, + DocumentPageMode.DOCUMENTACTIVITY.toString(), pageId), + DOCUMENT_ACTIVITIES_AND_UPDATES); + + createButtonLink(grid, PERSON_REFERENCES, VaadinIcons.USER, + new PageModeMenuCommand(UserViews.DOCUMENT_VIEW_NAME, + DocumentPageMode.PERSONREFERENCES.toString(), pageId), + REFERENCES_TO_INDIVIDUALS_IN_THE_DOCUMENT); + + createButtonLink(grid, DOCUMENT_DETAILS, VaadinIcons.FILE_TEXT, + new PageModeMenuCommand(UserViews.DOCUMENT_VIEW_NAME, + DocumentPageMode.DOCUMENTDETAILS.toString(), pageId), + DETAILED_INFORMATION_ABOUT_THE_DOCUMENT); + + createButtonLink(grid, DOCUMENT_DATA, VaadinIcons.FILE_TEXT, + new PageModeMenuCommand(UserViews.DOCUMENT_VIEW_NAME, + DocumentPageMode.DOCUMENTDATA.toString(), pageId), + COMPLETE_DOCUMENT_TEXT_AND_DATA); + + createButtonLink(grid, DOCUMENT_REFERENCES, VaadinIcons.FILE_TREE, + new PageModeMenuCommand(UserViews.DOCUMENT_VIEW_NAME, + DocumentPageMode.DOCUMENTREFERENCES.toString(), pageId), + REFERENCES_CITED_IN_THE_DOCUMENT); + + createButtonLink(grid, DOCUMENT_DECISION, VaadinIcons.CLIPBOARD_CHECK, + new PageModeMenuCommand(UserViews.DOCUMENT_VIEW_NAME, + DocumentPageMode.DOCUMENTDECISION.toString(), pageId), + DECISIONS_AND_OUTCOMES_RELATED_TO_THE_DOCUMENT); + + createButtonLink(grid, DOCUMENT_ATTACHEMENTS, VaadinIcons.PAPERCLIP, + new PageModeMenuCommand(UserViews.DOCUMENT_VIEW_NAME, + DocumentPageMode.DOCUMENTATTACHMENTS.toString(), pageId), + ATTACHMENTS_AND_SUPPLEMENTARY_FILES); } } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/GovernmentBodyMenuItemFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/GovernmentBodyMenuItemFactoryImpl.java index 1663d981f7..ee932a58d5 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/GovernmentBodyMenuItemFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/GovernmentBodyMenuItemFactoryImpl.java @@ -39,37 +39,8 @@ * The Class GovernmentBodyMenuItemFactoryImpl. */ @Service -public final class GovernmentBodyMenuItemFactoryImpl extends AbstractMenuItemFactoryImpl implements GovernmentBodyMenuItemFactory { - - /** The Constant EXPENDITURE. */ - private static final String EXPENDITURE = "Expenditure"; - - /** The Constant GOVERNMENT_BODY_RANKING. */ - private static final String GOVERNMENT_BODY_RANKING = "GovernmentBody Ranking"; - - /** The Constant HEADCOUNT_CHART. */ - private static final String HEADCOUNT_CHART = "Headcount chart"; - - /** The Constant INCOME. */ - private static final String INCOME = "Income"; - - /** The Constant OVERVIEW_TEXT. */ - private static final String OVERVIEW_TEXT = "Overview"; - - /** The Constant PAGE_VISIT_HISTORY_TEXT. */ - private static final String PAGE_VISIT_HISTORY_TEXT = "Page Visit History"; - - /** The Constant HEADCOUNT_DESCRIPTION. */ - private static final String HEADCOUNT_DESCRIPTION = "Government body: headcount trends."; - - /** The Constant INCOME_DESCRIPTION. */ - private static final String INCOME_DESCRIPTION = "Government body: income analysis."; - - /** The Constant EXPENDITURE_DESCRIPTION. */ - private static final String EXPENDITURE_DESCRIPTION = "Government body: expenditure review."; - - /** The Constant PAGE_VISIT_HISTORY_DESCRIPTION. */ - private static final String PAGE_VISIT_HISTORY_DESCRIPTION = "Page visit history for this government body."; +public final class GovernmentBodyMenuItemFactoryImpl extends AbstractMenuItemFactoryImpl + implements GovernmentBodyMenuItemFactory { /** The application menu item factory. */ @Autowired @@ -87,30 +58,32 @@ public GovernmentBodyMenuItemFactoryImpl() { } @Override - public void createGovernmentBodyMenuBar(final MenuBar menuBar, final String pageId, final String title ) { + public void createGovernmentBodyMenuBar(final MenuBar menuBar, final String pageId, final String title) { initApplicationMenuBar(menuBar); applicationMenuItemFactory.addRankingMenu(menuBar); - governmentBodyRankingMenuItemFactory.createGovernmentBodyRankingTopics(menuBar.addItem(GOVERNMENT_BODY_RANKING, VaadinIcons.BUILDING_O,null)); - - final MenuItem governmentBodyItem = menuBar.addItem(title, VaadinIcons.BUILDING_O,null); + governmentBodyRankingMenuItemFactory.createGovernmentBodyRankingTopics( + menuBar.addItem(GOVERNMENT_BODY_RANKING, VaadinIcons.BUILDING_O, null)); + final MenuItem governmentBodyItem = menuBar.addItem(title, VaadinIcons.BUILDING_O, null); - governmentBodyItem.addItem(OVERVIEW_TEXT, VaadinIcons.FILE_TEXT, + governmentBodyItem.addItem(GOVERNMENT_BODY_OVERVIEW_TEXT, VaadinIcons.FILE_TEXT, new PageModeMenuCommand(UserViews.GOVERNMENT_BODY_VIEW_NAME, PageMode.OVERVIEW, pageId)); governmentBodyItem.addItem(HEADCOUNT_CHART, VaadinIcons.USER, - new PageModeMenuCommand(UserViews.GOVERNMENT_BODY_VIEW_NAME, GovernmentBodyPageMode.HEADCOUNT.toString(), pageId)); + new PageModeMenuCommand(UserViews.GOVERNMENT_BODY_VIEW_NAME, + GovernmentBodyPageMode.HEADCOUNT.toString(), pageId)); governmentBodyItem.addItem(INCOME, VaadinIcons.MONEY, - new PageModeMenuCommand(UserViews.GOVERNMENT_BODY_VIEW_NAME, GovernmentBodyPageMode.INCOME.toString(), pageId)); + new PageModeMenuCommand(UserViews.GOVERNMENT_BODY_VIEW_NAME, GovernmentBodyPageMode.INCOME.toString(), + pageId)); governmentBodyItem.addItem(EXPENDITURE, VaadinIcons.CREDIT_CARD, - new PageModeMenuCommand(UserViews.GOVERNMENT_BODY_VIEW_NAME, GovernmentBodyPageMode.EXPENDITURE.toString(), pageId)); - + new PageModeMenuCommand(UserViews.GOVERNMENT_BODY_VIEW_NAME, + GovernmentBodyPageMode.EXPENDITURE.toString(), pageId)); - governmentBodyItem.addItem(PAGE_VISIT_HISTORY_TEXT, VaadinIcons.CLOCK, + governmentBodyItem.addItem(GOVERNMENT_BODY_PAGE_VISIT_HISTORY_TEXT, VaadinIcons.CLOCK, new PageModeMenuCommand(UserViews.GOVERNMENT_BODY_VIEW_NAME, PageMode.PAGEVISITHISTORY, pageId)); } @@ -119,17 +92,24 @@ public void createGovernmentBodyMenuBar(final MenuBar menuBar, final String page public void createOverviewPage(final VerticalLayout panelContent, final String pageId) { final ResponsiveRow grid = RowUtil.createGridLayout(panelContent); - createButtonLink(grid,HEADCOUNT_CHART, VaadinIcons.USER, - new PageModeMenuCommand(UserViews.GOVERNMENT_BODY_VIEW_NAME, GovernmentBodyPageMode.HEADCOUNT.toString(), pageId), HEADCOUNT_DESCRIPTION); + createButtonLink(grid, HEADCOUNT_CHART, VaadinIcons.USER, + new PageModeMenuCommand(UserViews.GOVERNMENT_BODY_VIEW_NAME, + GovernmentBodyPageMode.HEADCOUNT.toString(), pageId), + HEADCOUNT_DESCRIPTION); - createButtonLink(grid,INCOME, VaadinIcons.MONEY, - new PageModeMenuCommand(UserViews.GOVERNMENT_BODY_VIEW_NAME, GovernmentBodyPageMode.INCOME.toString(), pageId), INCOME_DESCRIPTION); + createButtonLink(grid, INCOME, VaadinIcons.MONEY, + new PageModeMenuCommand(UserViews.GOVERNMENT_BODY_VIEW_NAME, GovernmentBodyPageMode.INCOME.toString(), + pageId), + INCOME_DESCRIPTION); - createButtonLink(grid,EXPENDITURE, VaadinIcons.CREDIT_CARD, - new PageModeMenuCommand(UserViews.GOVERNMENT_BODY_VIEW_NAME, GovernmentBodyPageMode.EXPENDITURE.toString(), pageId), EXPENDITURE_DESCRIPTION); + createButtonLink(grid, EXPENDITURE, VaadinIcons.CREDIT_CARD, + new PageModeMenuCommand(UserViews.GOVERNMENT_BODY_VIEW_NAME, + GovernmentBodyPageMode.EXPENDITURE.toString(), pageId), + EXPENDITURE_DESCRIPTION); - createButtonLink(grid,PAGE_VISIT_HISTORY_TEXT, VaadinIcons.CLOCK, - new PageModeMenuCommand(UserViews.GOVERNMENT_BODY_VIEW_NAME, PageMode.PAGEVISITHISTORY, pageId), PAGE_VISIT_HISTORY_DESCRIPTION); + createButtonLink(grid, GOVERNMENT_BODY_PAGE_VISIT_HISTORY_TEXT, VaadinIcons.CLOCK, + new PageModeMenuCommand(UserViews.GOVERNMENT_BODY_VIEW_NAME, PageMode.PAGEVISITHISTORY, pageId), + GOVERNMENT_BODY_PAGE_VISIT_HISTORY_DESCRIPTION); } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/GovernmentBodyRankingMenuItemFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/GovernmentBodyRankingMenuItemFactoryImpl.java index 26662f4f85..0019b96970 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/GovernmentBodyRankingMenuItemFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/GovernmentBodyRankingMenuItemFactoryImpl.java @@ -23,12 +23,7 @@ import com.hack23.cia.web.impl.ui.application.views.common.menufactory.api.ApplicationMenuItemFactory; import com.hack23.cia.web.impl.ui.application.views.common.menufactory.api.GovernmentBodyRankingMenuItemFactory; -import com.hack23.cia.web.impl.ui.application.views.common.pagelinks.api.PageModeMenuCommand; import com.hack23.cia.web.impl.ui.application.views.common.rows.RowUtil; -import com.hack23.cia.web.impl.ui.application.views.common.viewnames.GovernmentBodyPageMode; -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; import com.jarektoro.responsivelayout.ResponsiveRow; import com.vaadin.icons.VaadinIcons; import com.vaadin.ui.MenuBar; @@ -37,160 +32,111 @@ /** * The Class GovernmentBodyRankingMenuItemFactoryImpl. * - *

This class builds menus and overview pages for government body rankings, + *

+ * This class builds menus and overview pages for government body rankings, * enabling users to navigate through institutional staffing, revenue streams, * expenditure focus, and historical engagement patterns. Through integration * with {@link ApplicationMenuItemFactory}, it ensures a coherent experience - * within the main menu structure.

+ * within the main menu structure. + *

*/ @Service public final class GovernmentBodyRankingMenuItemFactoryImpl extends AbstractMenuItemFactoryImpl - implements GovernmentBodyRankingMenuItemFactory { - - /** Commands for different page modes within the Government Body Ranking view. */ - private static final PageModeMenuCommand COMMAN_OVERVIEW = new PageModeMenuCommand(UserViews.GOVERNMENT_BODY_RANKING_VIEW_NAME, - PageMode.OVERVIEW); - private static final PageModeMenuCommand COMMAND_DATAGRID = new PageModeMenuCommand(UserViews.GOVERNMENT_BODY_RANKING_VIEW_NAME, - PageMode.DATAGRID); - private static final PageModeMenuCommand COMMAND_EXPENDITURE = new PageModeMenuCommand(UserViews.GOVERNMENT_BODY_RANKING_VIEW_NAME, - GovernmentBodyPageMode.EXPENDITURE.toString()); - private static final PageModeMenuCommand COMMAND_HEADCOUNT = new PageModeMenuCommand(UserViews.GOVERNMENT_BODY_RANKING_VIEW_NAME, - GovernmentBodyPageMode.HEADCOUNT.toString()); - private static final PageModeMenuCommand COMMAND_INCOME = new PageModeMenuCommand(UserViews.GOVERNMENT_BODY_RANKING_VIEW_NAME, - GovernmentBodyPageMode.INCOME.toString()); - private static final PageModeMenuCommand COMMAND_PAGEVISITHISTORY = new PageModeMenuCommand(UserViews.GOVERNMENT_BODY_RANKING_VIEW_NAME, - PageMode.PAGEVISITHISTORY); - - /** The Constant COMMAND_GOVERNMENT_BODIES_EXPENDITURE. */ - private static final PageModeMenuCommand COMMAND_GOVERNMENT_BODIES_EXPENDITURE = new PageModeMenuCommand(UserViews.MINISTRY_RANKING_VIEW_NAME, - MinistryPageMode.GOVERNMENT_BODIES_EXPENDITURE.toString()); - - /** The Constant COMMAND_GOVERNMENT_BODIES_HEADCOUNT. */ - private static final PageModeMenuCommand COMMAND_GOVERNMENT_BODIES_HEADCOUNT = new PageModeMenuCommand(UserViews.MINISTRY_RANKING_VIEW_NAME, - MinistryPageMode.GOVERNMENT_BODIES_HEADCOUNT.toString()); - - /** The Constant COMMAND_GOVERNMENT_BODIES_INCOME. */ - private static final PageModeMenuCommand COMMAND_GOVERNMENT_BODIES_INCOME = new PageModeMenuCommand(UserViews.MINISTRY_RANKING_VIEW_NAME, - MinistryPageMode.GOVERNMENT_BODIES_INCOME.toString()); - - - /** The Constant GOVERNMENT_BODY_EXPENDITURE_PER_MINISTRY. */ - private static final String GOVERNMENT_BODY_EXPENDITURE_PER_MINISTRY = "Government body expenditure by ministry"; - - /** The Constant GOVERNMENT_BODIES. */ - private static final String GOVERNMENT_BODY_HEADCOUNT_PER_MINISTRY = "Government body headcount by ministry"; - - /** The Constant GOVERNMENT_BODY_INCOME_PER_MINISTRY. */ - private static final String GOVERNMENT_BODY_INCOME_PER_MINISTRY = "Government body income by ministry"; - - - /** The Constant GOVERNMENT_BODY_HEADCOUNT_PER_MINISTRY_DESCRIPTION. */ - private static final String GOVERNMENT_BODY_HEADCOUNT_PER_MINISTRY_DESCRIPTION = "Chart over total headcount for all goverment bodies governed by ministries"; - - /** The Constant GOVERNMENT_BODY_INCOME_PER_MINISTRY_DESCRIPTION. */ - private static final String GOVERNMENT_BODY_INCOME_PER_MINISTRY_DESCRIPTION = "Chart over total income for all goverment bodies governed by ministries"; - - /** The Constant GOVERNMENT_BODY_EXPENDITURE_PER_MINISTRY_DESCRIPTION. */ - private static final String GOVERNMENT_BODY_EXPENDITURE_PER_MINISTRY_DESCRIPTION = "Chart over total spending for all goverment bodies governed by ministries"; - - - - - /** Menu labels. */ - private static final String EXPENDITURE = "Expenditure"; - private static final String GOVERNMENT_BODIES = "Government bodies"; - private static final String GOVERNMENT_BODY_RANKING = "GovernmentBody Ranking"; - private static final String HEADCOUNT = "Headcount"; - private static final String INCOME = "Income"; - private static final String OVERVIEW_TEXT = "Overview"; - private static final String PAGE_VISIT_HISTORY_TEXT = "Page Visit History"; - - /** Descriptions ~50 chars. */ - private static final String HEADCOUNT_DESCRIPTION = "Staffing levels reveal institutional influence."; - private static final String INCOME_DESCRIPTION = "Compare institutions by their revenue streams."; - private static final String EXPENDITURE_DESCRIPTION = "Assess how bodies allocate and prioritize spending."; - private static final String PAGE_VISIT_HISTORY_DESCRIPTION = "Explore historical interest, engagement patterns."; - private static final String CURRENT_GOVERNMENT_BODIES_DESCRIPTION = "All bodies: study structural roles and authority."; - - /** The application menu item factory, used to integrate into the main menu. */ - @Autowired - private ApplicationMenuItemFactory applicationMenuItemFactory; - - /** - * Instantiates a new government body ranking menu item factory implementation. - */ - public GovernmentBodyRankingMenuItemFactoryImpl() { - super(); - } - - /** - * Creates the government body ranking menu bar and integrates it into the main - * application menu. Adds government body ranking topics as sub-items. - * - * @param menuBar the main application {@link MenuBar} to which the government - * body ranking menu will be added. - */ - @Override - public void createGovernmentBodyRankingMenuBar(final MenuBar menuBar) { - initApplicationMenuBar(menuBar); - applicationMenuItemFactory.addRankingMenu(menuBar); - createGovernmentBodyRankingTopics(menuBar.addItem(GOVERNMENT_BODY_RANKING, VaadinIcons.BUILDING_O, null)); - } - - /** - * Adds menu items for various government body ranking topics: - *
    - *
  • Overview: General dashboard icon
    • - *
  • Government Bodies: Building icon for institutions
    • - *
  • Headcount: Multiple users for staffing
    • - *
  • Income: Money deposit icon for revenues
    • - *
  • Expenditure: Money withdraw icon for spending
    • - *
  • Page Visit History: History icon for past engagement
    • - *
- * - * @param menuItem the {@link MenuBar.MenuItem} representing "GovernmentBody Ranking" - * under which these topics will be added. - */ - @Override - public void createGovernmentBodyRankingTopics(final MenuBar.MenuItem menuItem) { - menuItem.addItem(OVERVIEW_TEXT, VaadinIcons.DASHBOARD, COMMAN_OVERVIEW); - menuItem.addItem(GOVERNMENT_BODIES, VaadinIcons.BUILDING_O, COMMAND_DATAGRID); - menuItem.addItem(GOVERNMENT_BODY_HEADCOUNT_PER_MINISTRY, VaadinIcons.USER_CHECK, COMMAND_GOVERNMENT_BODIES_HEADCOUNT); - menuItem.addItem(GOVERNMENT_BODY_INCOME_PER_MINISTRY, VaadinIcons.MONEY, COMMAND_GOVERNMENT_BODIES_INCOME); - menuItem.addItem(GOVERNMENT_BODY_EXPENDITURE_PER_MINISTRY, VaadinIcons.MONEY_WITHDRAW, COMMAND_GOVERNMENT_BODIES_EXPENDITURE); - - menuItem.addItem(HEADCOUNT, VaadinIcons.USERS, COMMAND_HEADCOUNT); - menuItem.addItem(INCOME, VaadinIcons.MONEY_DEPOSIT, COMMAND_INCOME); - menuItem.addItem(EXPENDITURE, VaadinIcons.MONEY_WITHDRAW, COMMAND_EXPENDITURE); - menuItem.addItem(PAGE_VISIT_HISTORY_TEXT, VaadinIcons.CHART, COMMAND_PAGEVISITHISTORY); - } - - /** - * Creates the overview page with quick-access links to government body ranking topics. - * Each button uses an icon and a brief description to guide the user: - *
    - *
  • Government Bodies: Building icon, structural roles
    • - *
  • Headcount: Users icon, staffing influence
    • - *
  • Income: Money deposit icon, revenue streams
    • - *
  • Expenditure: Money withdraw icon, spending focus
    • - *
  • Page Visit History: History icon, past engagement
    • - *
- * - * @param panelContent the {@link VerticalLayout} container that holds the overview - * content. New UI components will be added here. - */ - @Override - public void createOverviewPage(final VerticalLayout panelContent) { - final ResponsiveRow grid = RowUtil.createGridLayout(panelContent); - - createButtonLink(grid, GOVERNMENT_BODIES, VaadinIcons.BUILDING_O, COMMAND_DATAGRID, CURRENT_GOVERNMENT_BODIES_DESCRIPTION); - createButtonLink(grid, GOVERNMENT_BODY_HEADCOUNT_PER_MINISTRY, VaadinIcons.USER_CHECK, COMMAND_GOVERNMENT_BODIES_HEADCOUNT, GOVERNMENT_BODY_HEADCOUNT_PER_MINISTRY_DESCRIPTION); - createButtonLink(grid, GOVERNMENT_BODY_INCOME_PER_MINISTRY, VaadinIcons.MONEY, COMMAND_GOVERNMENT_BODIES_INCOME, GOVERNMENT_BODY_INCOME_PER_MINISTRY_DESCRIPTION); - createButtonLink(grid, GOVERNMENT_BODY_EXPENDITURE_PER_MINISTRY, VaadinIcons.MONEY_WITHDRAW, COMMAND_GOVERNMENT_BODIES_EXPENDITURE, GOVERNMENT_BODY_EXPENDITURE_PER_MINISTRY_DESCRIPTION); - - createButtonLink(grid, HEADCOUNT, VaadinIcons.USERS, COMMAND_HEADCOUNT, HEADCOUNT_DESCRIPTION); - createButtonLink(grid, INCOME, VaadinIcons.MONEY_DEPOSIT, COMMAND_INCOME, INCOME_DESCRIPTION); - createButtonLink(grid, EXPENDITURE, VaadinIcons.MONEY_WITHDRAW, COMMAND_EXPENDITURE, EXPENDITURE_DESCRIPTION); - createButtonLink(grid, PAGE_VISIT_HISTORY_TEXT, VaadinIcons.CHART, COMMAND_PAGEVISITHISTORY, PAGE_VISIT_HISTORY_DESCRIPTION); - } + implements GovernmentBodyRankingMenuItemFactory { + + /** The application menu item factory, used to integrate into the main menu. */ + @Autowired + private ApplicationMenuItemFactory applicationMenuItemFactory; + + /** + * Instantiates a new government body ranking menu item factory implementation. + */ + public GovernmentBodyRankingMenuItemFactoryImpl() { + super(); + } + + /** + * Creates the government body ranking menu bar and integrates it into the main + * application menu. Adds government body ranking topics as sub-items. + * + * @param menuBar the main application {@link MenuBar} to which the government + * body ranking menu will be added. + */ + @Override + public void createGovernmentBodyRankingMenuBar(final MenuBar menuBar) { + initApplicationMenuBar(menuBar); + applicationMenuItemFactory.addRankingMenu(menuBar); + createGovernmentBodyRankingTopics( + menuBar.addItem(GOVERNMENT_BODY_RANKING, VaadinIcons.BUILDING_O, null)); + } + + /** + * Adds menu items for various government body ranking topics: + *
    + *
  • Overview: General dashboard icon
    • + *
  • Government Bodies: Building icon for institutions
    • + *
  • Headcount: Multiple users for staffing
    • + *
  • Income: Money deposit icon for revenues
    • + *
  • Expenditure: Money withdraw icon for spending
    • + *
  • Page Visit History: History icon for past engagement
    • + *
+ * + * @param menuItem the {@link MenuBar.MenuItem} representing "GovernmentBody + * Ranking" + * under which these topics will be added. + */ + @Override + public void createGovernmentBodyRankingTopics(final MenuBar.MenuItem menuItem) { + menuItem.addItem(OVERVIEW_TEXT, VaadinIcons.DASHBOARD, GOVERNMENT_BODY_COMMAN_OVERVIEW); + menuItem.addItem(GOVERNMENT_BODIES, VaadinIcons.BUILDING_O, COMMAND_DATAGRID); + menuItem.addItem(GOVERNMENT_BODIES_HEADCOUNT, VaadinIcons.USER_CHECK, + COMMAND_GOVERNMENT_BODIES_HEADCOUNT); + menuItem.addItem(GOVERNMENT_BODIES_INCOME, VaadinIcons.MONEY, COMMAND_GOVERNMENT_BODIES_INCOME); + menuItem.addItem(GOVERNMENT_BODIES_EXPENDITURE, VaadinIcons.MONEY_WITHDRAW, + COMMAND_GOVERNMENT_BODIES_EXPENDITURE); + + menuItem.addItem(HEADCOUNT, VaadinIcons.USERS, GOVERNMENT_BODY_COMMAND_HEADCOUNT); + menuItem.addItem(INCOME, VaadinIcons.MONEY_DEPOSIT, GOVERNMENT_BODY_COMMAND_INCOME); + menuItem.addItem(EXPENDITURE, VaadinIcons.MONEY_WITHDRAW, GOVERNMENT_BODY_COMMAND_EXPENDITURE); + menuItem.addItem(PAGE_VISIT_HISTORY_TEXT, VaadinIcons.CHART, COMMAND_PAGEVISITHISTORY); + } + + /** + * Creates the overview page with quick-access links to government body ranking + * topics. + * Each button uses an icon and a brief description to guide the user: + *
    + *
  • Government Bodies: Building icon, structural roles
    • + *
  • Headcount: Users icon, staffing influence
    • + *
  • Income: Money deposit icon, revenue streams
    • + *
  • Expenditure: Money withdraw icon, spending focus
    • + *
  • Page Visit History: History icon, past engagement
    • + *
+ * + * @param panelContent the {@link VerticalLayout} container that holds the + * overview + * content. New UI components will be added here. + */ + @Override + public void createOverviewPage(final VerticalLayout panelContent) { + final ResponsiveRow grid = RowUtil.createGridLayout(panelContent); + + createButtonLink(grid, GOVERNMENT_BODIES, VaadinIcons.BUILDING_O, COMMAND_DATAGRID, + GOVERNMENT_BODIES_DESCRIPTION); + createButtonLink(grid, GOVERNMENT_BODIES_HEADCOUNT, VaadinIcons.USER_CHECK, + COMMAND_GOVERNMENT_BODIES_HEADCOUNT, GOVERNMENT_BODIES_HEADCOUNT_DESCRIPTION); + createButtonLink(grid, GOVERNMENT_BODIES_INCOME, VaadinIcons.MONEY, COMMAND_GOVERNMENT_BODIES_INCOME, + GOVERNMENT_BODIES_INCOME_DESCRIPTION); + createButtonLink(grid, GOVERNMENT_BODIES_EXPENDITURE, VaadinIcons.MONEY_WITHDRAW, + COMMAND_GOVERNMENT_BODIES_EXPENDITURE, GOVERNMENT_BODIES_EXPENDITURE_DESCRIPTION); + + createButtonLink(grid, HEADCOUNT, VaadinIcons.USERS, GOVERNMENT_BODY_COMMAND_HEADCOUNT, + HEADCOUNT_DESCRIPTION); + createButtonLink(grid, INCOME, VaadinIcons.MONEY_DEPOSIT, GOVERNMENT_BODY_COMMAND_INCOME, + INCOME_DESCRIPTION); + createButtonLink(grid, EXPENDITURE, VaadinIcons.MONEY_WITHDRAW, GOVERNMENT_BODY_COMMAND_EXPENDITURE, + EXPENDITURE_DESCRIPTION); + createButtonLink(grid, PAGE_VISIT_HISTORY_TEXT, VaadinIcons.CHART, COMMAND_PAGEVISITHISTORY, + PAGE_VISIT_HISTORY_DESCRIPTION); + } } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/MinistryMenuItemFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/MinistryMenuItemFactoryImpl.java index 2b3f8288dd..15d04665d6 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/MinistryMenuItemFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/MinistryMenuItemFactoryImpl.java @@ -41,72 +41,6 @@ @Service public final class MinistryMenuItemFactoryImpl extends AbstractMenuItemFactoryImpl implements MinistryMenuItemFactory { - /** The Constant CURRENT_MEMBERS_TEXT. */ - private static final String CURRENT_MEMBERS_TEXT = "Current Members"; - - /** The Constant DOCUMENT_ACTIVITY_TEXT. */ - private static final String DOCUMENT_ACTIVITY_TEXT = "Document Activity"; - - /** The Constant DOCUMENT_HISTORY_TEXT. */ - private static final String DOCUMENT_HISTORY_TEXT = "Document history"; - - /** The Constant DOCUMENTS_TEXT. */ - private static final String DOCUMENTS_TEXT = "Documents"; - - /** The Constant GOVERNMENT_BODIES_EXPENDITURE. */ - private static final String GOVERNMENT_BODIES_EXPENDITURE = "Government bodies expenditure"; - - /** The Constant GOVERNMENT_BODIES. */ - private static final String GOVERNMENT_BODIES_HEADCOUNT = "Government bodies headcount"; - - /** The Constant GOVERNMENT_BODIES_INCOME. */ - private static final String GOVERNMENT_BODIES_INCOME = "Government bodies income"; - - /** The Constant MEMBER_HISTORY_TEXT. */ - private static final String MEMBER_HISTORY_TEXT = "Member History"; - - /** The Constant MINISTRY_RANKING. */ - private static final String MINISTRY_RANKING = "Ministry Ranking"; - - /** The Constant OVERVIEW_TEXT. */ - private static final String OVERVIEW_TEXT = "Overview"; - - /** The Constant PAGE_VISIT_HISTORY_TEXT. */ - private static final String PAGE_VISIT_HISTORY_TEXT = "Page Visit History"; - - /** The Constant ROLE_GHANT_TEXT. */ - private static final String ROLE_GHANT_TEXT = "RoleGhant"; - - /** The Constant ROLES_TEXT. */ - private static final String ROLES_TEXT = "Roles"; - - /** The Constant CURRENT_MEMBERS_DESCRIPTION. */ - private static final String CURRENT_MEMBERS_DESCRIPTION = "Members currently holding positions"; - - /** The Constant MEMBER_HISTORY_DESCRIPTION. */ - private static final String MEMBER_HISTORY_DESCRIPTION = "Current and past members"; - - /** The Constant ROLE_GHANT_DESCRIPTION. */ - private static final String ROLE_GHANT_DESCRIPTION = "Gantt chart for all the roles"; - - /** The Constant GOVERNMENT_BODIES_HEADCOUNT_DESCRIPTION. */ - private static final String GOVERNMENT_BODIES_HEADCOUNT_DESCRIPTION = "All government bodies that are governed by ministry"; - - /** The Constant GOVERNMENT_BODIES_INCOME_DESCRIPTION. */ - private static final String GOVERNMENT_BODIES_INCOME_DESCRIPTION = "All government bodies income"; - - /** The Constant GOVERNMENT_BODIES_EXPENDITURE_DESCRIPTION. */ - private static final String GOVERNMENT_BODIES_EXPENDITURE_DESCRIPTION = "All government bodies expenditure"; - - /** The Constant DOCUMENT_ACTIVITY_DESCRIPTION. */ - private static final String DOCUMENT_ACTIVITY_DESCRIPTION = "Chart over document activity"; - - /** The Constant DOCUMENT_HISTORY_DESCRIPTION. */ - private static final String DOCUMENT_HISTORY_DESCRIPTION = "List of all document sorted by most recent"; - - /** The Constant PAGE_VISIT_HISTORY_DESCRIPTION. */ - private static final String PAGE_VISIT_HISTORY_DESCRIPTION = "View history of page visit for this page."; - /** The application menu item factory. */ @Autowired private ApplicationMenuItemFactory applicationMenuItemFactory; @@ -128,10 +62,10 @@ public void createMinistryMenuBar(final MenuBar menuBar, final String pageId) { applicationMenuItemFactory.addRankingMenu(menuBar); - ministryRankingMenuItemFactory.createMinistryRankingTopics(menuBar.addItem(MINISTRY_RANKING, VaadinIcons.GROUP,null)); - - final MenuItem ministryItem = menuBar.addItem("Ministry "+ pageId, VaadinIcons.GROUP,null); + ministryRankingMenuItemFactory + .createMinistryRankingTopics(menuBar.addItem(MINISTRY_RANKING, VaadinIcons.GROUP, null)); + final MenuItem ministryItem = menuBar.addItem("Ministry " + pageId, VaadinIcons.GROUP, null); ministryItem.addItem(OVERVIEW_TEXT, VaadinIcons.GROUP, new PageModeMenuCommand(UserViews.MINISTRY_VIEW_NAME, PageMode.OVERVIEW, pageId)); @@ -147,21 +81,26 @@ public void createMinistryMenuBar(final MenuBar menuBar, final String pageId) { new PageModeMenuCommand(UserViews.MINISTRY_VIEW_NAME, MinistryPageMode.ROLEGHANT.toString(), pageId)); rolesItem.addItem(GOVERNMENT_BODIES_HEADCOUNT, VaadinIcons.GROUP, - new PageModeMenuCommand(UserViews.MINISTRY_VIEW_NAME, MinistryPageMode.GOVERNMENT_BODIES_HEADCOUNT.toString(), pageId)); + new PageModeMenuCommand(UserViews.MINISTRY_VIEW_NAME, + MinistryPageMode.GOVERNMENT_BODIES_HEADCOUNT.toString(), pageId)); rolesItem.addItem(GOVERNMENT_BODIES_INCOME, VaadinIcons.GROUP, - new PageModeMenuCommand(UserViews.MINISTRY_VIEW_NAME, MinistryPageMode.GOVERNMENT_BODIES_INCOME.toString(), pageId)); + new PageModeMenuCommand(UserViews.MINISTRY_VIEW_NAME, + MinistryPageMode.GOVERNMENT_BODIES_INCOME.toString(), pageId)); rolesItem.addItem(GOVERNMENT_BODIES_EXPENDITURE, VaadinIcons.GROUP, - new PageModeMenuCommand(UserViews.MINISTRY_VIEW_NAME, MinistryPageMode.GOVERNMENT_BODIES_EXPENDITURE.toString(), pageId)); + new PageModeMenuCommand(UserViews.MINISTRY_VIEW_NAME, + MinistryPageMode.GOVERNMENT_BODIES_EXPENDITURE.toString(), pageId)); final MenuItem documentItem = ministryItem.addItem(DOCUMENTS_TEXT, VaadinIcons.GROUP, null); - documentItem.addItem(DOCUMENT_ACTIVITY_TEXT, VaadinIcons.GROUP, new PageModeMenuCommand(UserViews.MINISTRY_VIEW_NAME, - MinistryPageMode.DOCUMENTACTIVITY.toString(), pageId)); + documentItem.addItem(DOCUMENT_ACTIVITY_TEXT, VaadinIcons.GROUP, + new PageModeMenuCommand(UserViews.MINISTRY_VIEW_NAME, + MinistryPageMode.DOCUMENTACTIVITY.toString(), pageId)); - documentItem.addItem(DOCUMENT_HISTORY_TEXT, VaadinIcons.GROUP, new PageModeMenuCommand(UserViews.MINISTRY_VIEW_NAME, - MinistryPageMode.DOCUMENTHISTORY.toString(), pageId)); + documentItem.addItem(DOCUMENT_HISTORY_TEXT, VaadinIcons.GROUP, + new PageModeMenuCommand(UserViews.MINISTRY_VIEW_NAME, + MinistryPageMode.DOCUMENTHISTORY.toString(), pageId)); ministryItem.addItem(PAGE_VISIT_HISTORY_TEXT, VaadinIcons.GROUP, new PageModeMenuCommand(UserViews.MINISTRY_VIEW_NAME, PageMode.PAGEVISITHISTORY, pageId)); @@ -172,33 +111,48 @@ public void createMinistryMenuBar(final MenuBar menuBar, final String pageId) { public void createOverviewPage(final VerticalLayout panelContent, final String pageId) { final ResponsiveRow grid = RowUtil.createGridLayout(panelContent); - createButtonLink(grid,CURRENT_MEMBERS_TEXT, VaadinIcons.GROUP, new PageModeMenuCommand(UserViews.MINISTRY_VIEW_NAME, - MinistryPageMode.CURRENTMEMBERS.toString(), pageId), CURRENT_MEMBERS_DESCRIPTION); - - createButtonLink(grid,MEMBER_HISTORY_TEXT, VaadinIcons.GROUP, new PageModeMenuCommand(UserViews.MINISTRY_VIEW_NAME, - MinistryPageMode.MEMBERHISTORY.toString(), pageId), MEMBER_HISTORY_DESCRIPTION); - - createButtonLink(grid,ROLE_GHANT_TEXT, VaadinIcons.GROUP, - new PageModeMenuCommand(UserViews.MINISTRY_VIEW_NAME, MinistryPageMode.ROLEGHANT.toString(), pageId), ROLE_GHANT_DESCRIPTION); - - createButtonLink(grid,GOVERNMENT_BODIES_HEADCOUNT, VaadinIcons.GROUP, - new PageModeMenuCommand(UserViews.MINISTRY_VIEW_NAME, MinistryPageMode.GOVERNMENT_BODIES_HEADCOUNT.toString(), pageId), GOVERNMENT_BODIES_HEADCOUNT_DESCRIPTION); - - createButtonLink(grid,GOVERNMENT_BODIES_INCOME, VaadinIcons.GROUP, - new PageModeMenuCommand(UserViews.MINISTRY_VIEW_NAME, MinistryPageMode.GOVERNMENT_BODIES_INCOME.toString(), pageId), GOVERNMENT_BODIES_INCOME_DESCRIPTION); - - createButtonLink(grid,GOVERNMENT_BODIES_EXPENDITURE, VaadinIcons.GROUP, - new PageModeMenuCommand(UserViews.MINISTRY_VIEW_NAME, MinistryPageMode.GOVERNMENT_BODIES_EXPENDITURE.toString(), pageId), GOVERNMENT_BODIES_EXPENDITURE_DESCRIPTION); - - createButtonLink(grid,DOCUMENT_ACTIVITY_TEXT, VaadinIcons.GROUP, new PageModeMenuCommand(UserViews.MINISTRY_VIEW_NAME, - MinistryPageMode.DOCUMENTACTIVITY.toString(), pageId), DOCUMENT_ACTIVITY_DESCRIPTION); - - createButtonLink(grid,DOCUMENT_HISTORY_TEXT, VaadinIcons.GROUP, new PageModeMenuCommand(UserViews.MINISTRY_VIEW_NAME, - MinistryPageMode.DOCUMENTHISTORY.toString(), pageId), DOCUMENT_HISTORY_DESCRIPTION); - - createButtonLink(grid,PAGE_VISIT_HISTORY_TEXT, VaadinIcons.GROUP, - new PageModeMenuCommand(UserViews.MINISTRY_VIEW_NAME, PageMode.PAGEVISITHISTORY, pageId), PAGE_VISIT_HISTORY_DESCRIPTION); - + createButtonLink(grid, CURRENT_MEMBERS_TEXT, VaadinIcons.GROUP, + new PageModeMenuCommand(UserViews.MINISTRY_VIEW_NAME, + MinistryPageMode.CURRENTMEMBERS.toString(), pageId), + CURRENT_MEMBERS_DESCRIPTION); + + createButtonLink(grid, MEMBER_HISTORY_TEXT, VaadinIcons.GROUP, + new PageModeMenuCommand(UserViews.MINISTRY_VIEW_NAME, + MinistryPageMode.MEMBERHISTORY.toString(), pageId), + MEMBER_HISTORY_DESCRIPTION); + + createButtonLink(grid, ROLE_GHANT_TEXT, VaadinIcons.GROUP, + new PageModeMenuCommand(UserViews.MINISTRY_VIEW_NAME, MinistryPageMode.ROLEGHANT.toString(), pageId), + ROLE_GHANT_DESCRIPTION); + + createButtonLink(grid, GOVERNMENT_BODIES_HEADCOUNT, VaadinIcons.GROUP, + new PageModeMenuCommand(UserViews.MINISTRY_VIEW_NAME, + MinistryPageMode.GOVERNMENT_BODIES_HEADCOUNT.toString(), pageId), + GOVERNMENT_BODIES_HEADCOUNT_DESCRIPTION); + + createButtonLink(grid, GOVERNMENT_BODIES_INCOME, VaadinIcons.GROUP, + new PageModeMenuCommand(UserViews.MINISTRY_VIEW_NAME, + MinistryPageMode.GOVERNMENT_BODIES_INCOME.toString(), pageId), + GOVERNMENT_BODIES_INCOME_DESCRIPTION); + + createButtonLink(grid, GOVERNMENT_BODIES_EXPENDITURE, VaadinIcons.GROUP, + new PageModeMenuCommand(UserViews.MINISTRY_VIEW_NAME, + MinistryPageMode.GOVERNMENT_BODIES_EXPENDITURE.toString(), pageId), + GOVERNMENT_BODIES_EXPENDITURE_DESCRIPTION); + + createButtonLink(grid, DOCUMENT_ACTIVITY_TEXT, VaadinIcons.GROUP, + new PageModeMenuCommand(UserViews.MINISTRY_VIEW_NAME, + MinistryPageMode.DOCUMENTACTIVITY.toString(), pageId), + DOCUMENT_ACTIVITY_DESCRIPTION); + + createButtonLink(grid, DOCUMENT_HISTORY_TEXT, VaadinIcons.GROUP, + new PageModeMenuCommand(UserViews.MINISTRY_VIEW_NAME, + MinistryPageMode.DOCUMENTHISTORY.toString(), pageId), + DOCUMENT_HISTORY_DESCRIPTION); + + createButtonLink(grid, PAGE_VISIT_HISTORY_TEXT, VaadinIcons.GROUP, + new PageModeMenuCommand(UserViews.MINISTRY_VIEW_NAME, PageMode.PAGEVISITHISTORY, pageId), + PAGE_VISIT_HISTORY_DESCRIPTION); } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/MinistryRankingMenuItemFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/MinistryRankingMenuItemFactoryImpl.java index ae859fc38b..f6711aa4b2 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/MinistryRankingMenuItemFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/MinistryRankingMenuItemFactoryImpl.java @@ -23,12 +23,7 @@ import com.hack23.cia.web.impl.ui.application.views.common.menufactory.api.ApplicationMenuItemFactory; import com.hack23.cia.web.impl.ui.application.views.common.menufactory.api.MinistryRankingMenuItemFactory; -import com.hack23.cia.web.impl.ui.application.views.common.pagelinks.api.PageModeMenuCommand; import com.hack23.cia.web.impl.ui.application.views.common.rows.RowUtil; -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; import com.jarektoro.responsivelayout.ResponsiveRow; import com.vaadin.icons.VaadinIcons; import com.vaadin.ui.MenuBar; @@ -42,142 +37,6 @@ public final class MinistryRankingMenuItemFactoryImpl extends AbstractMenuItemFactoryImpl implements MinistryRankingMenuItemFactory { - /** The Constant MINISTRIES_LEADER_SCOREBOARD. */ - private static final String MINISTRIES_LEADER_SCOREBOARD = "Government Ministers Scoreboard"; - - /** The Constant ALL_MINISTRIES_TOTAL_MEMBERS_TEXT. */ - private static final String ALL_MINISTRIES_TOTAL_MEMBERS_TEXT = "All ministries, total members"; - - /** The Constant ALL_PARTIES_TOTAL_DAYS_SERVED_IN_MINISTRIES_TEXT. */ - private static final String ALL_PARTIES_TOTAL_DAYS_SERVED_IN_MINISTRIES_TEXT = "All parties, total days served in ministries"; - - /** The Constant CHART_BY_TOPIC_TEXT. */ - private static final String CHART_BY_TOPIC_TEXT = "Chart by topic"; - - /** The Constant COMMAN_OVERVIEW. */ - private static final PageModeMenuCommand COMMAN_OVERVIEW = new PageModeMenuCommand(UserViews.MINISTRY_RANKING_VIEW_NAME, - PageMode.OVERVIEW); - - /** The Constant COMMAND_CHARTS_ALL_GOVERNMENT_ROLE_GANTT. */ - private static final PageModeMenuCommand COMMAND_CHARTS_ALL_GOVERNMENT_ROLE_GANTT = new PageModeMenuCommand(UserViews.MINISTRY_RANKING_VIEW_NAME, - PageMode.CHARTS, ChartIndicators.ALL_GOVERNMENT_ROLE_CHART.toString()); - - /** The Constant COMMAND_CHARTS_ALL_MINISTRIES_BY_HEADCOUNT. */ - private static final PageModeMenuCommand COMMAND_CHARTS_ALL_MINISTRIES_BY_HEADCOUNT = new PageModeMenuCommand(UserViews.MINISTRY_RANKING_VIEW_NAME, - PageMode.CHARTS, ChartIndicators.ALLMINISTRIESBYHEADCOUNT.toString()); - - /** The Constant COMMAND_CHARTS_ALLMINISTRIES_BY_TOTAL_DAYS. */ - private static final PageModeMenuCommand COMMAND_CHARTS_ALLMINISTRIES_BY_TOTAL_DAYS = new PageModeMenuCommand(UserViews.MINISTRY_RANKING_VIEW_NAME, - PageMode.CHARTS, ChartIndicators.ALLMINISTRIESPARTYBYTOTALDAYS.toString()); - - /** The Constant COMMAND_CHARTS_CURRENT_MINISTRIES_BY_HEADCOUNT. */ - private static final PageModeMenuCommand COMMAND_CHARTS_CURRENT_MINISTRIES_BY_HEADCOUNT = new PageModeMenuCommand(UserViews.MINISTRY_RANKING_VIEW_NAME, - PageMode.CHARTS, ChartIndicators.CURRENTMINISTRIESBYHEADCOUNT.toString()); - - /** The Constant COMMAND_CHARTS_CURRENT_PARTIES_BY_HEADCOUNT. */ - private static final PageModeMenuCommand COMMAND_CHARTS_CURRENT_PARTIES_BY_HEADCOUNT = new PageModeMenuCommand(UserViews.MINISTRY_RANKING_VIEW_NAME, - PageMode.CHARTS, ChartIndicators.CURRENTPARTIESBYHEADCOUNT.toString()); - - /** The Constant COMMAND_CHARTS_CURRENT_MINISTRIES_LEADER_SCOREBOARD. */ - private static final PageModeMenuCommand COMMAND_CHARTS_CURRENT_MINISTRIES_LEADER_SCOREBOARD = new PageModeMenuCommand(UserViews.MINISTRY_RANKING_VIEW_NAME, - PageMode.CHARTS, ChartIndicators.CURRENTMINISTRIESLEADERSCORECARD.toString()); - - /** The Constant COMMAND_DATAGRID. */ - private static final PageModeMenuCommand COMMAND_DATAGRID = new PageModeMenuCommand(UserViews.MINISTRY_RANKING_VIEW_NAME, - PageMode.DATAGRID); - - /** The Constant COMMAND_GOVERNMENT_BODIES_EXPENDITURE. */ - private static final PageModeMenuCommand COMMAND_GOVERNMENT_BODIES_EXPENDITURE = new PageModeMenuCommand(UserViews.MINISTRY_RANKING_VIEW_NAME, - MinistryPageMode.GOVERNMENT_BODIES_EXPENDITURE.toString()); - - /** The Constant COMMAND_GOVERNMENT_BODIES_HEADCOUNT. */ - private static final PageModeMenuCommand COMMAND_GOVERNMENT_BODIES_HEADCOUNT = new PageModeMenuCommand(UserViews.MINISTRY_RANKING_VIEW_NAME, - MinistryPageMode.GOVERNMENT_BODIES_HEADCOUNT.toString()); - - /** The Constant COMMAND_GOVERNMENT_BODIES_INCOME. */ - private static final PageModeMenuCommand COMMAND_GOVERNMENT_BODIES_INCOME = new PageModeMenuCommand(UserViews.MINISTRY_RANKING_VIEW_NAME, - MinistryPageMode.GOVERNMENT_BODIES_INCOME.toString()); - - /** The Constant COMMAND_GOVERNMENT_OUTCOME. */ - private static final PageModeMenuCommand COMMAND_GOVERNMENT_OUTCOME = new PageModeMenuCommand(UserViews.MINISTRY_RANKING_VIEW_NAME, - MinistryPageMode.GOVERNMENT_OUTCOME.toString()); - - /** The Constant COMMAND_PAGEVISITHISTORY. */ - private static final PageModeMenuCommand COMMAND_PAGEVISITHISTORY = new PageModeMenuCommand(UserViews.MINISTRY_RANKING_VIEW_NAME, - PageMode.PAGEVISITHISTORY); - - /** - * The Constant - * CURRENT_AND_PAST_MEMBER_AND_SUMMARY_OF_TOTAL_POLTICIAL_DAYS_MEMBERSHIP_DESCRIPTION. - */ - private static final String CURRENT_AND_PAST_MEMBER_AND_SUMMARY_OF_TOTAL_POLTICIAL_DAYS_MEMBERSHIP_DESCRIPTION = "Current and past member and summary of total polticial days membership"; - - /** The Constant CURRENT_MINISTRIES_CURRENT_MEMBERS_TEXT. */ - private static final String CURRENT_MINISTRIES_CURRENT_MEMBERS_TEXT = "Current ministries, current members"; - - /** The Constant CURRENT_PARTIES_ACTIVE_IN_MINISTRIES_HEAD_COUNT_TEXT. */ - private static final String CURRENT_PARTIES_ACTIVE_IN_MINISTRIES_HEAD_COUNT_TEXT = "Current parties active in ministries, head count"; - - /** The Constant GOVERNMENT_BODY_EXPENDITURE_PER_MINISTRY. */ - private static final String GOVERNMENT_BODY_EXPENDITURE_PER_MINISTRY = "Government body expenditure by ministry"; - - /** The Constant GOVERNMENT_BODIES. */ - private static final String GOVERNMENT_BODY_HEADCOUNT_PER_MINISTRY = "Government body headcount by ministry"; - - /** The Constant GOVERNMENT_BODY_INCOME_PER_MINISTRY. */ - private static final String GOVERNMENT_BODY_INCOME_PER_MINISTRY = "Government body income by ministry"; - - /** The Constant GOVERNMENT_OUTCOME. */ - private static final String GOVERNMENT_OUTCOME = "Government outcome"; - - /** The Constant GOVERNMENT_ROLES_CHART. */ - private static final String GOVERNMENT_ROLES_CHART = "Government roles chart"; - - /** The Constant MINISTRY_RANKING. */ - private static final String MINISTRY_RANKING = "Ministry Ranking"; - - /** The Constant OVERVIEW_TEXT. */ - private static final String OVERVIEW_TEXT = "Overview"; - - /** The Constant PAGE_VISIT_HISTORY_TEXT. */ - private static final String PAGE_VISIT_HISTORY_TEXT = "Page Visit History"; - - /** The Constant POLITICAL_WORK_SUMMARY_TEXT. */ - private static final String POLITICAL_WORK_SUMMARY_TEXT = "Political Work Summary"; - - /** The Constant CURRENT_MINISTRIES_CURRENT_MEMBERS_DESCRIPTION. */ - private static final String CURRENT_MINISTRIES_CURRENT_MEMBERS_DESCRIPTION = "Chart over current ministries by headcount"; - - /** The Constant CURRENT_PARTIES_ACTIVE_IN_MINISTRIES_HEAD_COUNT_DESCRIPTION. */ - private static final String CURRENT_PARTIES_ACTIVE_IN_MINISTRIES_HEAD_COUNT_DESCRIPTION = "Chart over current parties active in ministries by headcount"; - - /** The Constant MINISTRIES_LEADER_SCOREBOARD_DESCRIPTION. */ - private static final String MINISTRIES_LEADER_SCOREBOARD_DESCRIPTION = "Cabinet leaders: power and institutional impact."; - - /** The Constant ALL_PARTIES_TOTAL_DAYS_SERVED_IN_MINISTRIES_DESCRIPTION. */ - private static final String ALL_PARTIES_TOTAL_DAYS_SERVED_IN_MINISTRIES_DESCRIPTION = "Chart over all parties hold positons in ministries by headcount"; - - /** The Constant ALL_MINISTRIES_TOTAL_MEMBERS_DESCRIPTION. */ - private static final String ALL_MINISTRIES_TOTAL_MEMBERS_DESCRIPTION = "Chart over all ministries by total headcount"; - - /** The Constant GOVERNMENT_BODY_HEADCOUNT_PER_MINISTRY_DESCRIPTION. */ - private static final String GOVERNMENT_BODY_HEADCOUNT_PER_MINISTRY_DESCRIPTION = "Chart over total headcount for all goverment bodies governed by ministries"; - - /** The Constant GOVERNMENT_BODY_INCOME_PER_MINISTRY_DESCRIPTION. */ - private static final String GOVERNMENT_BODY_INCOME_PER_MINISTRY_DESCRIPTION = "Chart over total income for all goverment bodies governed by ministries"; - - /** The Constant GOVERNMENT_BODY_EXPENDITURE_PER_MINISTRY_DESCRIPTION. */ - private static final String GOVERNMENT_BODY_EXPENDITURE_PER_MINISTRY_DESCRIPTION = "Chart over total spending for all goverment bodies governed by ministries"; - - /** The Constant GOVERNMENT_OUTCOME_DESCRIPTION. */ - private static final String GOVERNMENT_OUTCOME_DESCRIPTION = "Economic and financial data for Sweden, SDDS Plus"; - - /** The Constant GOVERNMENT_ROLES_CHART_DESCRIPTION. */ - private static final String GOVERNMENT_ROLES_CHART_DESCRIPTION = "Gantt chart all goverment roles"; - - /** The Constant PAGE_VISIT_HISTORY_DESCRIPTION. */ - private static final String PAGE_VISIT_HISTORY_DESCRIPTION = "View history of page visit for this page."; - /** The application menu item factory. */ @Autowired private ApplicationMenuItemFactory applicationMenuItemFactory; @@ -202,33 +61,38 @@ public void createMinistryRankingMenuBar(final MenuBar menuBar) { @Override public void createMinistryRankingTopics(final MenuItem ministryMenuItem) { - ministryMenuItem.addItem(OVERVIEW_TEXT, VaadinIcons.DASHBOARD, COMMAN_OVERVIEW); + ministryMenuItem.addItem(OVERVIEW_TEXT, VaadinIcons.DASHBOARD, COMMAND_MINISTRY_RANKING_OVERVIEW); - final MenuItem listItem = ministryMenuItem.addItem(POLITICAL_WORK_SUMMARY_TEXT, VaadinIcons.BAR_CHART, COMMAND_DATAGRID); - listItem.setDescription(CURRENT_AND_PAST_MEMBER_AND_SUMMARY_OF_TOTAL_POLTICIAL_DAYS_MEMBERSHIP_DESCRIPTION); + final MenuItem listItem = ministryMenuItem.addItem(POLITICAL_WORK_SUMMARY_TEXT, VaadinIcons.BAR_CHART, + COMMAND_MINISTRY_RANKING_DATAGRID); + listItem.setDescription(CURRENT_AND_PAST_MEMBER_AND_SUMMARY_OF_POLTICIAL_DAYS); final MenuItem chartByTopic = ministryMenuItem.addItem(CHART_BY_TOPIC_TEXT, VaadinIcons.PIE_CHART, null); + chartByTopic.addItem(MINISTRIES_LEADER_SCOREBOARD, VaadinIcons.TROPHY, + COMMAND_CHARTS_CURRENT_MINISTRIES_LEADER_SCOREBOARD); - chartByTopic.addItem(MINISTRIES_LEADER_SCOREBOARD, VaadinIcons.TROPHY,COMMAND_CHARTS_CURRENT_MINISTRIES_LEADER_SCOREBOARD); - - chartByTopic.addItem(GOVERNMENT_BODY_HEADCOUNT_PER_MINISTRY, VaadinIcons.USER_CHECK, COMMAND_GOVERNMENT_BODIES_HEADCOUNT); + chartByTopic.addItem(GOVERNMENT_BODIES_HEADCOUNT, VaadinIcons.USER_CHECK, COMMAND_GOVERNMENT_BODIES_HEADCOUNT); - chartByTopic.addItem(GOVERNMENT_BODY_INCOME_PER_MINISTRY, VaadinIcons.MONEY, COMMAND_GOVERNMENT_BODIES_INCOME); + chartByTopic.addItem(GOVERNMENT_BODIES_INCOME, VaadinIcons.MONEY, COMMAND_GOVERNMENT_BODIES_INCOME); - chartByTopic.addItem(GOVERNMENT_BODY_EXPENDITURE_PER_MINISTRY, VaadinIcons.MONEY_WITHDRAW, COMMAND_GOVERNMENT_BODIES_EXPENDITURE); + chartByTopic.addItem(GOVERNMENT_BODIES_EXPENDITURE, VaadinIcons.MONEY_WITHDRAW, + COMMAND_GOVERNMENT_BODIES_EXPENDITURE); chartByTopic.addItem(GOVERNMENT_OUTCOME, VaadinIcons.BAR_CHART, COMMAND_GOVERNMENT_OUTCOME); - chartByTopic.addItem(CURRENT_MINISTRIES_CURRENT_MEMBERS_TEXT, VaadinIcons.USERS, COMMAND_CHARTS_CURRENT_MINISTRIES_BY_HEADCOUNT); - chartByTopic.addItem(CURRENT_PARTIES_ACTIVE_IN_MINISTRIES_HEAD_COUNT_TEXT, VaadinIcons.GROUP, COMMAND_CHARTS_CURRENT_PARTIES_BY_HEADCOUNT); + chartByTopic.addItem(CURRENT_MINISTRIES_CURRENT_MEMBERS_TEXT, VaadinIcons.USERS, + COMMAND_CHARTS_CURRENT_MINISTRIES_BY_HEADCOUNT); + chartByTopic.addItem(CURRENT_PARTIES_ACTIVE_IN_MINISTRIES_CURRENT_ASSIGNMENTS, VaadinIcons.GROUP, + COMMAND_CHARTS_CURRENT_PARTIES_BY_HEADCOUNT); - chartByTopic.addItem(ALL_PARTIES_TOTAL_DAYS_SERVED_IN_MINISTRIES_TEXT, VaadinIcons.CALENDAR, COMMAND_CHARTS_ALLMINISTRIES_BY_TOTAL_DAYS); + chartByTopic.addItem(ALL_PARTIES_TOTAL_DAYS_SERVED_IN_MINISTRIES, VaadinIcons.CALENDAR, + COMMAND_CHARTS_ALLMINISTRIES_BY_TOTAL_DAYS); - chartByTopic.addItem(ALL_MINISTRIES_TOTAL_MEMBERS_TEXT, VaadinIcons.USER, COMMAND_CHARTS_ALL_MINISTRIES_BY_HEADCOUNT); + chartByTopic.addItem(ALL_MINISTRIES_TOTAL_MEMBERS, VaadinIcons.USER, + COMMAND_CHARTS_ALL_MINISTRIES_BY_HEADCOUNT); - - chartByTopic.addItem(GOVERNMENT_ROLES_CHART, VaadinIcons.BAR_CHART , COMMAND_CHARTS_ALL_GOVERNMENT_ROLE_GANTT); + chartByTopic.addItem(GOVERNMENT_ROLES_CHART, VaadinIcons.BAR_CHART, COMMAND_CHARTS_ALL_GOVERNMENT_ROLE_GANTT); ministryMenuItem.addItem(PAGE_VISIT_HISTORY_TEXT, VaadinIcons.CHART, COMMAND_PAGEVISITHISTORY); @@ -238,31 +102,41 @@ public void createMinistryRankingTopics(final MenuItem ministryMenuItem) { public void createOverviewPage(final VerticalLayout panelContent) { final ResponsiveRow grid = RowUtil.createGridLayout(panelContent); - createButtonLink(grid, MINISTRIES_LEADER_SCOREBOARD, VaadinIcons.TROPHY, COMMAND_CHARTS_CURRENT_MINISTRIES_LEADER_SCOREBOARD, + createButtonLink(grid, MINISTRIES_LEADER_SCOREBOARD, VaadinIcons.TROPHY, + COMMAND_CHARTS_CURRENT_MINISTRIES_LEADER_SCOREBOARD, MINISTRIES_LEADER_SCOREBOARD_DESCRIPTION); - createButtonLink(grid, GOVERNMENT_BODY_HEADCOUNT_PER_MINISTRY, VaadinIcons.USER_CHECK, COMMAND_GOVERNMENT_BODIES_HEADCOUNT, GOVERNMENT_BODY_HEADCOUNT_PER_MINISTRY_DESCRIPTION); - - createButtonLink(grid, GOVERNMENT_BODY_INCOME_PER_MINISTRY, VaadinIcons.MONEY, COMMAND_GOVERNMENT_BODIES_INCOME, GOVERNMENT_BODY_INCOME_PER_MINISTRY_DESCRIPTION); + createButtonLink(grid, GOVERNMENT_BODIES_HEADCOUNT, VaadinIcons.USER_CHECK, COMMAND_GOVERNMENT_BODIES_HEADCOUNT, + GOVERNMENT_BODIES_HEADCOUNT_DESCRIPTION); - createButtonLink(grid, GOVERNMENT_BODY_EXPENDITURE_PER_MINISTRY, VaadinIcons.MONEY_WITHDRAW, COMMAND_GOVERNMENT_BODIES_EXPENDITURE, GOVERNMENT_BODY_EXPENDITURE_PER_MINISTRY_DESCRIPTION); + createButtonLink(grid, GOVERNMENT_BODIES_INCOME, VaadinIcons.MONEY, COMMAND_GOVERNMENT_BODIES_INCOME, + GOVERNMENT_BODIES_INCOME_DESCRIPTION); - createButtonLink(grid, GOVERNMENT_OUTCOME, VaadinIcons.BAR_CHART, COMMAND_GOVERNMENT_OUTCOME, GOVERNMENT_OUTCOME_DESCRIPTION); + createButtonLink(grid, GOVERNMENT_BODIES_EXPENDITURE, VaadinIcons.MONEY_WITHDRAW, + COMMAND_GOVERNMENT_BODIES_EXPENDITURE, GOVERNMENT_BODIES_EXPENDITURE_DESCRIPTION); + createButtonLink(grid, GOVERNMENT_OUTCOME, VaadinIcons.BAR_CHART, COMMAND_GOVERNMENT_OUTCOME, + GOVERNMENT_OUTCOME_DESCRIPTION); - createButtonLink(grid,GOVERNMENT_ROLES_CHART, VaadinIcons.LINE_CHART, COMMAND_CHARTS_ALL_GOVERNMENT_ROLE_GANTT, GOVERNMENT_ROLES_CHART_DESCRIPTION); + createButtonLink(grid, GOVERNMENT_ROLES_CHART, VaadinIcons.LINE_CHART, COMMAND_CHARTS_ALL_GOVERNMENT_ROLE_GANTT, + GOVERNMENT_ROLES_CHART_DESCRIPTION); - createButtonLink(grid, CURRENT_MINISTRIES_CURRENT_MEMBERS_TEXT, VaadinIcons.USERS, COMMAND_CHARTS_CURRENT_MINISTRIES_BY_HEADCOUNT, - CURRENT_MINISTRIES_CURRENT_MEMBERS_DESCRIPTION); + createButtonLink(grid, CURRENT_MINISTRIES_CURRENT_MEMBERS_TEXT, VaadinIcons.USERS, + COMMAND_CHARTS_CURRENT_MINISTRIES_BY_HEADCOUNT, + CURRENT_COMMITTEES_CURRENT_MEMBERS_DESCRIPTION); - createButtonLink(grid, CURRENT_PARTIES_ACTIVE_IN_MINISTRIES_HEAD_COUNT_TEXT, VaadinIcons.GROUP, COMMAND_CHARTS_CURRENT_PARTIES_BY_HEADCOUNT, - CURRENT_PARTIES_ACTIVE_IN_MINISTRIES_HEAD_COUNT_DESCRIPTION); + createButtonLink(grid, CURRENT_PARTIES_ACTIVE_IN_MINISTRIES_CURRENT_ASSIGNMENTS, VaadinIcons.GROUP, + COMMAND_CHARTS_CURRENT_PARTIES_BY_HEADCOUNT, + CURRENT_PARTIES_ACTIVE_IN_COMMITTEES_CURRENT_ASSIGNMENTS_DESCRIPTION); - createButtonLink(grid, ALL_PARTIES_TOTAL_DAYS_SERVED_IN_MINISTRIES_TEXT, VaadinIcons.CALENDAR, COMMAND_CHARTS_ALLMINISTRIES_BY_TOTAL_DAYS, - ALL_PARTIES_TOTAL_DAYS_SERVED_IN_MINISTRIES_DESCRIPTION); - createButtonLink(grid, ALL_MINISTRIES_TOTAL_MEMBERS_TEXT, VaadinIcons.USER, COMMAND_CHARTS_ALL_MINISTRIES_BY_HEADCOUNT, ALL_MINISTRIES_TOTAL_MEMBERS_DESCRIPTION); + createButtonLink(grid, ALL_PARTIES_TOTAL_DAYS_SERVED_IN_MINISTRIES, VaadinIcons.CALENDAR, + COMMAND_CHARTS_ALLMINISTRIES_BY_TOTAL_DAYS, + CURRENT_PARTIES_ACTIVE_IN_COMMITTEES_TOTAL_DAYS_SERVED_IN_COMMITTEES_DESCRIPTION); + createButtonLink(grid, ALL_MINISTRIES_TOTAL_MEMBERS, VaadinIcons.USER, + COMMAND_CHARTS_ALL_MINISTRIES_BY_HEADCOUNT, ALL_COMMITTEES_TOTAL_MEMBERS_DESCRIPTION); - createButtonLink(grid, PAGE_VISIT_HISTORY_TEXT, VaadinIcons.CHART, COMMAND_PAGEVISITHISTORY, PAGE_VISIT_HISTORY_DESCRIPTION); + createButtonLink(grid, PAGE_VISIT_HISTORY_TEXT, VaadinIcons.CHART, COMMAND_PAGEVISITHISTORY, + PAGE_VISIT_HISTORY_DESCRIPTION); } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/ParliamentMenuItemFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/ParliamentMenuItemFactoryImpl.java index 973a4a3a2f..6d5a82ec36 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/ParliamentMenuItemFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/ParliamentMenuItemFactoryImpl.java @@ -23,12 +23,7 @@ import com.hack23.cia.web.impl.ui.application.views.common.menufactory.api.ApplicationMenuItemFactory; import com.hack23.cia.web.impl.ui.application.views.common.menufactory.api.ParliamentMenuItemFactory; -import com.hack23.cia.web.impl.ui.application.views.common.pagelinks.api.PageModeMenuCommand; import com.hack23.cia.web.impl.ui.application.views.common.rows.RowUtil; -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.RiskIndicators; -import com.hack23.cia.web.impl.ui.application.views.common.viewnames.UserViews; import com.jarektoro.responsivelayout.ResponsiveRow; import com.vaadin.icons.VaadinIcons; import com.vaadin.ui.MenuBar; @@ -39,108 +34,8 @@ * The Class ParliamentMenuItemFactoryImpl. */ @Service -public final class ParliamentMenuItemFactoryImpl extends AbstractMenuItemFactoryImpl implements ParliamentMenuItemFactory { - - /** The Constant COMMAND_CHARTS_DECISION_FLOW. */ - private static final PageModeMenuCommand COMMAND_CHARTS_DECISION_FLOW = new PageModeMenuCommand( - UserViews.PARLIAMENT_RANKING_VIEW_NAME, PageMode.CHARTS, ChartIndicators.DECISION_FLOW_CHART.toString()); - - /** The Constant COMMAND_CHARTS_PARTY_AGE. */ - private static final PageModeMenuCommand COMMAND_CHARTS_PARTY_AGE = new PageModeMenuCommand( - UserViews.PARLIAMENT_RANKING_VIEW_NAME, PageMode.CHARTS, ChartIndicators.PARTYAGE.toString()); - - /** The Constant COMMAND_CHARTS_PARTY_GENDER. */ - private static final PageModeMenuCommand COMMAND_CHARTS_PARTY_GENDER = new PageModeMenuCommand( - UserViews.PARLIAMENT_RANKING_VIEW_NAME, PageMode.CHARTS, ChartIndicators.PARTYGENDER.toString()); - - /** The Constant COMMAND_CHARTS_PARTY_WINNER. */ - private static final PageModeMenuCommand COMMAND_CHARTS_PARTY_WINNER = new PageModeMenuCommand( - UserViews.PARLIAMENT_RANKING_VIEW_NAME, PageMode.CHARTS, ChartIndicators.PARTYWINNER.toString()); - - /** The Constant COMMAND_DECISION_ACTIVITY. */ - private static final PageModeMenuCommand COMMAND_DECISION_ACTIVITY = new PageModeMenuCommand( - UserViews.PARLIAMENT_RANKING_VIEW_NAME, PageMode.CHARTS, ChartIndicators.DECISIONACTIVITYBYTYPE.toString()); - - /** The Constant COMMAND_DOCUMENT_ACTIVITY. */ - private static final PageModeMenuCommand COMMAND_DOCUMENT_ACTIVITY = new PageModeMenuCommand( - UserViews.PARLIAMENT_RANKING_VIEW_NAME, PageMode.CHARTS, ChartIndicators.DOCUMENTACTIVITYBYTYPE.toString()); - - /** The Constant COMMAND_OVERVIEW. */ - private static final PageModeMenuCommand COMMAND_OVERVIEW = new PageModeMenuCommand(UserViews.PARLIAMENT_RANKING_VIEW_NAME, PageMode.OVERVIEW); - - /** The Constant COMMAND_PAGEVISITHISTORY. */ - private static final PageModeMenuCommand COMMAND_PAGEVISITHISTORY = new PageModeMenuCommand(UserViews.PARLIAMENT_RANKING_VIEW_NAME, PageMode.PAGEVISITHISTORY); - - /** The Constant COMMAND_RISK_SUMMARY. */ - private static final PageModeMenuCommand COMMAND_RISK_SUMMARY = new PageModeMenuCommand( - UserViews.PARLIAMENT_RANKING_VIEW_NAME, PageMode.RULES, RiskIndicators.RISK_SUMMARY.toString()); - - /** The Constant COMMAND_RULE_VIOLATION. */ - private static final PageModeMenuCommand COMMAND_RULE_VIOLATION = new PageModeMenuCommand( - UserViews.PARLIAMENT_RANKING_VIEW_NAME, PageMode.RULES, RiskIndicators.RULE_VIOLATIONS.toString()); - - /** The Constant DECISION_ACTIVITY_BY_TYPE. */ - private static final String DECISION_ACTIVITY_BY_TYPE = "Decision activity by type"; - - /** The Constant DECISION_FLOW. */ - private static final String DECISION_FLOW = "Decision flow"; - - /** The Constant DECISION_FLOW_DESCRIPTION. */ - private static final String DECISION_FLOW_DESCRIPTION = "Decision flow description"; - - /** The Constant DOCUMENT_ACTIVITY_BY_TYPE. */ - private static final String DOCUMENT_ACTIVITY_BY_TYPE = "Document activity by type"; - - /** The Constant OVERVIEW_TEXT. */ - private static final String OVERVIEW_TEXT = "Overview"; - - /** The Constant PAGE_VISIT_HISTORY_TEXT. */ - private static final String PAGE_VISIT_HISTORY_TEXT = "Page Visit History"; - - /** The Constant PARLIAMENT_RANKING_TEXT. */ - private static final String PARLIAMENT_RANKING_TEXT = "Parliament Ranking"; - - /** The Constant PARTY_AGE. */ - private static final String PARTY_AGE = "Party Age"; - - /** The Constant PARTY_GENDER. */ - private static final String PARTY_GENDER = "Party Gender"; - - /** The Constant PARTY_WINNER. */ - private static final String PARTY_WINNER = "Party Winner"; - - /** The Constant RISK_SUMMARY. */ - private static final String RISK_SUMMARY = "Risk Summary"; - - /** The Constant RULE_VIOLATIONS. */ - private static final String RULE_VIOLATIONS = "Rule Violations"; - - /** The Constant SWEDISH_PARLIAMENT_INDICATORS. */ - private static final String SWEDISH_PARLIAMENT_INDICATORS = "Swedish parliament Indicators"; - - /** The Constant PARTY_WINNER_DESCRIPTION. */ - private static final String PARTY_WINNER_DESCRIPTION = "Daily average % won ballots"; - - /** The Constant PARTY_GENDER_DESCRIPTION. */ - private static final String PARTY_GENDER_DESCRIPTION = "Average percentage male"; - - /** The Constant PARTY_AGE_DESCRIPTION. */ - private static final String PARTY_AGE_DESCRIPTION = "Average age"; - - /** The Constant RISK_SUMMARY_DESCRIPTION. */ - private static final String RISK_SUMMARY_DESCRIPTION = "Risk summary"; - - /** The Constant RULE_VIOLATIONS_DESCRIPTION. */ - private static final String RULE_VIOLATIONS_DESCRIPTION = "Rule violations"; - - /** The Constant DOCUMENT_ACTIVITY_DESCRIPTION. */ - private static final String DOCUMENT_ACTIVITY_DESCRIPTION = "Daily total of number published documents"; - - /** The Constant DECISION_ACTIVITY_DESCRIPTION. */ - private static final String DECISION_ACTIVITY_DESCRIPTION = "Daily total of number of decisions made"; - - /** The Constant PAGE_VISIT_HISTORY_DESCRIPTION. */ - private static final String PAGE_VISIT_HISTORY_DESCRIPTION = "View history of page visit for this page."; +public final class ParliamentMenuItemFactoryImpl extends AbstractMenuItemFactoryImpl + implements ParliamentMenuItemFactory { /** The application menu item factory. */ @Autowired @@ -157,23 +52,28 @@ public ParliamentMenuItemFactoryImpl() { public void createOverviewPage(final VerticalLayout panelContent) { final ResponsiveRow grid = RowUtil.createGridLayout(panelContent); - createButtonLink(grid,PARTY_WINNER,VaadinIcons.INSTITUTION, COMMAND_CHARTS_PARTY_WINNER, PARTY_WINNER_DESCRIPTION); - - createButtonLink(grid,PARTY_GENDER,VaadinIcons.INSTITUTION, COMMAND_CHARTS_PARTY_GENDER, PARTY_GENDER_DESCRIPTION); + createButtonLink(grid, PARTY_WINNER, VaadinIcons.INSTITUTION, COMMAND_CHARTS_PARTY_WINNER, + PARTY_WINNER_DESCRIPTION); - createButtonLink(grid,PARTY_AGE, VaadinIcons.INSTITUTION,COMMAND_CHARTS_PARTY_AGE, PARTY_AGE_DESCRIPTION); + createButtonLink(grid, PARTY_GENDER, VaadinIcons.INSTITUTION, COMMAND_CHARTS_PARTY_GENDER, + PARTY_GENDER_DESCRIPTION); - createButtonLink(grid,RISK_SUMMARY, VaadinIcons.INSTITUTION,COMMAND_RISK_SUMMARY,RISK_SUMMARY_DESCRIPTION); + createButtonLink(grid, PARTY_AGE, VaadinIcons.INSTITUTION, COMMAND_CHARTS_PARTY_AGE, PARTY_AGE_DESCRIPTION); - createButtonLink(grid,RULE_VIOLATIONS, VaadinIcons.INSTITUTION,COMMAND_RULE_VIOLATION,RULE_VIOLATIONS_DESCRIPTION); + createButtonLink(grid, RISK_SUMMARY, VaadinIcons.INSTITUTION, COMMAND_RISK_SUMMARY, RISK_SUMMARY_DESCRIPTION); - createButtonLink(grid,DOCUMENT_ACTIVITY_BY_TYPE,VaadinIcons.INSTITUTION, COMMAND_DOCUMENT_ACTIVITY, DOCUMENT_ACTIVITY_DESCRIPTION); - createButtonLink(grid,DECISION_ACTIVITY_BY_TYPE, VaadinIcons.INSTITUTION,COMMAND_DECISION_ACTIVITY, DECISION_ACTIVITY_DESCRIPTION); + createButtonLink(grid, RULE_VIOLATIONS, VaadinIcons.INSTITUTION, COMMAND_RULE_VIOLATION, + RULE_VIOLATIONS_DESCRIPTION); - createButtonLink(grid,DECISION_FLOW, VaadinIcons.INSTITUTION,COMMAND_CHARTS_DECISION_FLOW,DECISION_FLOW_DESCRIPTION); + createButtonLink(grid, DOCUMENT_ACTIVITY_BY_TYPE, VaadinIcons.INSTITUTION, COMMAND_DOCUMENT_ACTIVITY, + DOCUMENT_ACTIVITY_DESCRIPTION); + createButtonLink(grid, DECISION_ACTIVITY_BY_TYPE, VaadinIcons.INSTITUTION, COMMAND_DECISION_ACTIVITY, + DECISION_ACTIVITY_DESCRIPTION); + createButtonLink(grid, DECISION_FLOW, VaadinIcons.INSTITUTION, COMMAND_CHARTS_DECISION_FLOW, + DECISION_FLOW_DESCRIPTION); - createButtonLink(grid,PAGE_VISIT_HISTORY_TEXT, VaadinIcons.INSTITUTION, + createButtonLink(grid, PAGE_VISIT_HISTORY_TEXT, VaadinIcons.INSTITUTION, COMMAND_PAGEVISITHISTORY, PAGE_VISIT_HISTORY_DESCRIPTION); } @@ -195,34 +95,38 @@ public void createParliamentTopicMenu(final MenuItem charts) { final MenuItem chartIndicators = charts.addItem(SWEDISH_PARLIAMENT_INDICATORS, VaadinIcons.INSTITUTION, null); - final MenuItem addItem = chartIndicators.addItem(PARTY_WINNER,VaadinIcons.INSTITUTION, COMMAND_CHARTS_PARTY_WINNER); + final MenuItem addItem = chartIndicators.addItem(PARTY_WINNER, VaadinIcons.INSTITUTION, + COMMAND_CHARTS_PARTY_WINNER); addItem.setDescription(PARTY_WINNER_DESCRIPTION); - final MenuItem addItem2 = chartIndicators.addItem(PARTY_GENDER,VaadinIcons.INSTITUTION, COMMAND_CHARTS_PARTY_GENDER); + final MenuItem addItem2 = chartIndicators.addItem(PARTY_GENDER, VaadinIcons.INSTITUTION, + COMMAND_CHARTS_PARTY_GENDER); addItem2.setDescription(PARTY_GENDER_DESCRIPTION); - final MenuItem addItem3 = chartIndicators.addItem(PARTY_AGE, VaadinIcons.INSTITUTION,COMMAND_CHARTS_PARTY_AGE); + final MenuItem addItem3 = chartIndicators.addItem(PARTY_AGE, VaadinIcons.INSTITUTION, COMMAND_CHARTS_PARTY_AGE); addItem3.setDescription(PARTY_AGE_DESCRIPTION); - final MenuItem addItem7 = chartIndicators.addItem(RISK_SUMMARY, VaadinIcons.INSTITUTION,COMMAND_RISK_SUMMARY); + final MenuItem addItem7 = chartIndicators.addItem(RISK_SUMMARY, VaadinIcons.INSTITUTION, COMMAND_RISK_SUMMARY); addItem7.setDescription(RISK_SUMMARY_DESCRIPTION); - final MenuItem addItem8 = chartIndicators.addItem(RULE_VIOLATIONS, VaadinIcons.INSTITUTION,COMMAND_RULE_VIOLATION); + final MenuItem addItem8 = chartIndicators.addItem(RULE_VIOLATIONS, VaadinIcons.INSTITUTION, + COMMAND_RULE_VIOLATION); addItem8.setDescription(RULE_VIOLATIONS_DESCRIPTION); - - final MenuItem addItem4 = chartIndicators.addItem(DOCUMENT_ACTIVITY_BY_TYPE,VaadinIcons.INSTITUTION, COMMAND_DOCUMENT_ACTIVITY); + final MenuItem addItem4 = chartIndicators.addItem(DOCUMENT_ACTIVITY_BY_TYPE, VaadinIcons.INSTITUTION, + COMMAND_DOCUMENT_ACTIVITY); addItem4.setDescription(DOCUMENT_ACTIVITY_DESCRIPTION); - final MenuItem addItem5 = chartIndicators.addItem(DECISION_ACTIVITY_BY_TYPE, VaadinIcons.INSTITUTION,COMMAND_DECISION_ACTIVITY); + final MenuItem addItem5 = chartIndicators.addItem(DECISION_ACTIVITY_BY_TYPE, VaadinIcons.INSTITUTION, + COMMAND_DECISION_ACTIVITY); addItem5.setDescription(DECISION_ACTIVITY_DESCRIPTION); - final MenuItem addItem6 = chartIndicators.addItem(DECISION_FLOW, VaadinIcons.INSTITUTION,COMMAND_CHARTS_DECISION_FLOW); + final MenuItem addItem6 = chartIndicators.addItem(DECISION_FLOW, VaadinIcons.INSTITUTION, + COMMAND_CHARTS_DECISION_FLOW); addItem6.setDescription(DECISION_FLOW_DESCRIPTION); charts.addItem(PAGE_VISIT_HISTORY_TEXT, VaadinIcons.INSTITUTION, COMMAND_PAGEVISITHISTORY); } - } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/PartyMenuItemFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/PartyMenuItemFactoryImpl.java index 7077f8ff0e..ac33fb3cae 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/PartyMenuItemFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/PartyMenuItemFactoryImpl.java @@ -39,104 +39,8 @@ * The Class PartyMenuItemFactoryImpl. */ @Service -public final class PartyMenuItemFactoryImpl extends AbstractMenuItemFactoryImpl implements PartyMenuItemFactory { - - /** The Constant BALLOT_DECISION_SUMMARY_TEXT. */ - private static final String BALLOT_DECISION_SUMMARY_TEXT = "Ballot Decision Summary"; - - /** The Constant BALLOTS_TEXT. */ - private static final String BALLOTS_TEXT = "Ballots"; - - /** The Constant COMMITTEE_ROLES. */ - private static final String COMMITTEE_ROLES = "Committee Roles"; - - /** The Constant CURRENT_LEADERS. */ - private static final String CURRENT_LEADERS = "Current Leaders"; - - /** The Constant CURRENT_MEMBERS_TEXT. */ - private static final String CURRENT_MEMBERS_TEXT = "Current Members"; - - /** The Constant DOCUMENT_ACTIVITY_TEXT. */ - private static final String DOCUMENT_ACTIVITY_TEXT = "Document Activity"; - - /** The Constant DOCUMENT_HISTORY_TEXT. */ - private static final String DOCUMENT_HISTORY_TEXT = "Document history"; - - /** The Constant DOCUMENTS_TEXT. */ - private static final String DOCUMENTS_TEXT = "Documents"; - - /** The Constant GOVERMENT_ROLES. */ - private static final String GOVERMENT_ROLES = "Goverment Roles"; - - /** The Constant LEADER_HISTORY. */ - private static final String LEADER_HISTORY = "Leader History"; - - /** The Constant MEMBER_HISTORY_TEXT. */ - private static final String MEMBER_HISTORY_TEXT = "Member History"; - - - /** The Constant OVERVIEW_TEXT. */ - private static final String OVERVIEW_TEXT = "Overview"; - - /** The Constant PAGE_VISIT_HISTORY_TEXT. */ - private static final String PAGE_VISIT_HISTORY_TEXT = "Page Visit History"; - - /** The Constant PARTY_RANKING. */ - private static final String PARTY_RANKING = "Party Ranking"; - - /** The Constant PARTY_WON_DAILY_SUMMARY_CHART. */ - private static final String PARTY_WON_DAILY_SUMMARY_CHART = "Party Won Daily Summary Chart"; - - /** The Constant ROLE_CHART_PARTY_LEADERS. */ - private static final String ROLE_CHART_PARTY_LEADERS = "Role chart, party leaders"; - - /** The Constant ROLES_TEXT. */ - private static final String ROLES_TEXT = "Roles"; - - /** The Constant VOTE_HISTORY. */ - private static final String VOTE_HISTORY = "Vote history"; - - /** The Constant CURRENT_LEADERS_DESCRIPTION. */ - private static final String CURRENT_LEADERS_DESCRIPTION = "Current leaders"; - - /** The Constant LEADER_HISTORY_DESCRIPTION. */ - private static final String LEADER_HISTORY_DESCRIPTION = "Leader history"; - - /** The Constant CURRENT_MEMBERS_DESCRIPTION. */ - private static final String CURRENT_MEMBERS_DESCRIPTION = "Current members"; - - /** The Constant MEMBER_HISTORY_DESCRIPTION. */ - private static final String MEMBER_HISTORY_DESCRIPTION = "Current and past members"; - - /** The Constant GOVERMENT_ROLES_DESCRIPTION. */ - private static final String GOVERMENT_ROLES_DESCRIPTION = "Government roles hold"; - - /** The Constant COMMITTEE_ROLES_DESCRIPTION. */ - private static final String COMMITTEE_ROLES_DESCRIPTION = "Committe roles hold"; - - /** The Constant ROLE_CHART_PARTY_LEADERS_DESCRIPTION. */ - private static final String ROLE_CHART_PARTY_LEADERS_DESCRIPTION = "Gantt chart all party leaders"; - - /** The Constant DOCUMENT_ACTIVITY_DESCRIPTION. */ - private static final String DOCUMENT_ACTIVITY_DESCRIPTION = "Chart over document activity by type"; - - /** The Constant DOCUMENT_HISTORY_DESCRIPTION. */ - private static final String DOCUMENT_HISTORY_DESCRIPTION = "List all document history"; - - /** The Constant BALLOT_DECISION_SUMMARY_DESCRIPTION. */ - private static final String BALLOT_DECISION_SUMMARY_DESCRIPTION = "Ballot decision summary"; - - /** The Constant PARTY_WON_DAILY_SUMMARY_CHART_DESCRIPTION. */ - private static final String PARTY_WON_DAILY_SUMMARY_CHART_DESCRIPTION = "Chart for Party over won,absent and party rebel votes"; - - /** The Constant PARTY_AGAINST_COALATIONS_SUMMARY_DESCRIPTION. */ - private static final String PARTY_AGAINST_COALATIONS_SUMMARY_DESCRIPTION = "Coalations with groups of diffrent parties aginst committe proposals ballots"; - - /** The Constant PARTY_SUPPORT_SUMMARY_DESCRIPTION. */ - private static final String PARTY_SUPPORT_SUMMARY_DESCRIPTION = "Trend of agreements with other parties during ballots"; - - /** The Constant PAGE_VISIT_HISTORY_DESCRIPTION. */ - private static final String PAGE_VISIT_HISTORY_DESCRIPTION = "View history of page visit for this page."; +public final class PartyMenuItemFactoryImpl extends AbstractMenuItemFactoryImpl + implements PartyMenuItemFactory { /** The application menu item factory. */ @Autowired @@ -157,55 +61,69 @@ public PartyMenuItemFactoryImpl() { public void createOverviewPage(final VerticalLayout panelContent, final String pageId) { final ResponsiveRow grid = RowUtil.createGridLayout(panelContent); - createButtonLink(grid,CURRENT_LEADERS, VaadinIcons.GROUP, - new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, PartyPageMode.CURRENTLEADERS.toString(), pageId), CURRENT_LEADERS_DESCRIPTION); - - createButtonLink(grid,LEADER_HISTORY, VaadinIcons.GROUP, - new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, PartyPageMode.LEADERHISTORY.toString(), pageId), LEADER_HISTORY_DESCRIPTION); - - createButtonLink(grid,CURRENT_MEMBERS_TEXT, VaadinIcons.GROUP, - new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, PartyPageMode.CURRENTMEMBERS.toString(), pageId), CURRENT_MEMBERS_DESCRIPTION); - - createButtonLink(grid,MEMBER_HISTORY_TEXT, VaadinIcons.GROUP, - new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, PartyPageMode.MEMBERHISTORY.toString(), pageId), MEMBER_HISTORY_DESCRIPTION); - - createButtonLink(grid,GOVERMENT_ROLES, VaadinIcons.GROUP, - new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, PartyPageMode.GOVERNMENTROLES.toString(), pageId), GOVERMENT_ROLES_DESCRIPTION); + createButtonLink(grid, CURRENT_LEADERS, VaadinIcons.GROUP, + new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, PartyPageMode.CURRENTLEADERS.toString(), pageId), + CURRENT_LEADERS_DESCRIPTION); - createButtonLink(grid,COMMITTEE_ROLES, VaadinIcons.GROUP, - new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, PartyPageMode.COMMITTEEROLES.toString(), pageId), COMMITTEE_ROLES_DESCRIPTION); + createButtonLink(grid, LEADER_HISTORY, VaadinIcons.GROUP, + new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, PartyPageMode.LEADERHISTORY.toString(), pageId), + LEADER_HISTORY_DESCRIPTION); - createButtonLink(grid,ROLE_CHART_PARTY_LEADERS, VaadinIcons.GROUP, - new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, PartyPageMode.ROLEGHANT.toString(), pageId), ROLE_CHART_PARTY_LEADERS_DESCRIPTION); + createButtonLink(grid, CURRENT_MEMBERS_TEXT, VaadinIcons.GROUP, + new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, PartyPageMode.CURRENTMEMBERS.toString(), pageId), + CURRENT_MEMBERS_DESCRIPTION); + createButtonLink(grid, MEMBER_HISTORY_TEXT, VaadinIcons.GROUP, + new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, PartyPageMode.MEMBERHISTORY.toString(), pageId), + MEMBER_HISTORY_DESCRIPTION); - createButtonLink(grid,DOCUMENT_ACTIVITY_TEXT, VaadinIcons.GROUP, - new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, PartyPageMode.DOCUMENTACTIVITY.toString(), pageId), DOCUMENT_ACTIVITY_DESCRIPTION); + createButtonLink(grid, GOVERMENT_ROLES, VaadinIcons.GROUP, + new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, PartyPageMode.GOVERNMENTROLES.toString(), pageId), + GOVERMENT_ROLES_DESCRIPTION); - createButtonLink(grid,DOCUMENT_HISTORY_TEXT, VaadinIcons.GROUP, - new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, PartyPageMode.DOCUMENTHISTORY.toString(), pageId), DOCUMENT_HISTORY_DESCRIPTION); + createButtonLink(grid, COMMITTEE_ROLES, VaadinIcons.GROUP, + new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, PartyPageMode.COMMITTEEROLES.toString(), pageId), + COMMITTEE_ROLES_DESCRIPTION); + createButtonLink(grid, ROLE_CHART_PARTY_LEADERS, VaadinIcons.GROUP, + new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, PartyPageMode.ROLEGHANT.toString(), pageId), + ROLE_CHART_PARTY_LEADERS_DESCRIPTION); - createButtonLink(grid,VOTE_HISTORY, VaadinIcons.GROUP, - new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, PartyPageMode.VOTEHISTORY.toString(), pageId), VOTE_HISTORY); + createButtonLink(grid, DOCUMENT_ACTIVITY_TEXT, VaadinIcons.GROUP, + new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, PartyPageMode.DOCUMENTACTIVITY.toString(), pageId), + DOCUMENT_ACTIVITY_DESCRIPTION); - createButtonLink(grid,BALLOT_DECISION_SUMMARY_TEXT, VaadinIcons.GROUP, new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, - PartyPageMode.COMMITTEEBALLOTDECISIONSUMMARY.toString(), pageId), BALLOT_DECISION_SUMMARY_DESCRIPTION); + createButtonLink(grid, DOCUMENT_HISTORY_TEXT, VaadinIcons.GROUP, + new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, PartyPageMode.DOCUMENTHISTORY.toString(), pageId), + DOCUMENT_HISTORY_DESCRIPTION); - createButtonLink(grid,PARTY_WON_DAILY_SUMMARY_CHART, VaadinIcons.GROUP, new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, - PartyPageMode.PARTYWONDAILYSUMMARYCHART.toString(), pageId), PARTY_WON_DAILY_SUMMARY_CHART_DESCRIPTION); + createButtonLink(grid, VOTE_HISTORY, VaadinIcons.GROUP, + new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, PartyPageMode.VOTEHISTORY.toString(), pageId), + VOTE_HISTORY); + createButtonLink(grid, BALLOT_DECISION_SUMMARY_TEXT, VaadinIcons.GROUP, + new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, + PartyPageMode.COMMITTEEBALLOTDECISIONSUMMARY.toString(), pageId), + BALLOT_DECISION_SUMMARY_DESCRIPTION); - createButtonLink(grid,PartyPageMode.PARTYAGAINSTCOALATIONSSUMMARY.toString(), VaadinIcons.GROUP, new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, - PartyPageMode.PARTYAGAINSTCOALATIONSSUMMARY.toString(), pageId), PARTY_AGAINST_COALATIONS_SUMMARY_DESCRIPTION); + createButtonLink(grid, PARTY_WON_DAILY_SUMMARY_CHART, VaadinIcons.GROUP, + new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, + PartyPageMode.PARTYWONDAILYSUMMARYCHART.toString(), pageId), + PARTY_WON_DAILY_SUMMARY_CHART_DESCRIPTION); - createButtonLink(grid,PartyPageMode.PARTYSUPPORTSUMMARY.toString(), VaadinIcons.GROUP, new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, - PartyPageMode.PARTYSUPPORTSUMMARY.toString(), pageId), PARTY_SUPPORT_SUMMARY_DESCRIPTION); + createButtonLink(grid, PartyPageMode.PARTYAGAINSTCOALATIONSSUMMARY.toString(), VaadinIcons.GROUP, + new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, + PartyPageMode.PARTYAGAINSTCOALATIONSSUMMARY.toString(), pageId), + PARTY_AGAINST_COALATIONS_SUMMARY_DESCRIPTION); + createButtonLink(grid, PartyPageMode.PARTYSUPPORTSUMMARY.toString(), VaadinIcons.GROUP, + new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, + PartyPageMode.PARTYSUPPORTSUMMARY.toString(), pageId), + PARTY_SUPPORT_SUMMARY_DESCRIPTION); - createButtonLink(grid,PAGE_VISIT_HISTORY_TEXT, VaadinIcons.GROUP, - new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, PageMode.PAGEVISITHISTORY, pageId), PAGE_VISIT_HISTORY_DESCRIPTION); - + createButtonLink(grid, PAGE_VISIT_HISTORY_TEXT, VaadinIcons.GROUP, + new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, PageMode.PAGEVISITHISTORY, pageId), + PAGE_VISIT_HISTORY_DESCRIPTION); } @@ -215,9 +133,9 @@ public void createPartyMenuBar(final MenuBar menuBar, final String pageId) { applicationMenuItemFactory.addRankingMenu(menuBar); - partyRankingMenuItemFactory.createPartyRankingTopics(menuBar.addItem(PARTY_RANKING, VaadinIcons.GROUP,null)); + partyRankingMenuItemFactory.createPartyRankingTopics(menuBar.addItem(PARTY_RANKING, VaadinIcons.GROUP, null)); - final MenuItem partyItem = menuBar.addItem("Party "+ pageId, VaadinIcons.GROUP,null); + final MenuItem partyItem = menuBar.addItem("Party " + pageId, VaadinIcons.GROUP, null); partyItem.addItem(OVERVIEW_TEXT, VaadinIcons.GROUP, new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, PageMode.OVERVIEW, pageId)); @@ -245,7 +163,6 @@ public void createPartyMenuBar(final MenuBar menuBar, final String pageId) { rolesItem.addItem(ROLE_CHART_PARTY_LEADERS, VaadinIcons.GROUP, new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, PartyPageMode.ROLEGHANT.toString(), pageId)); - final MenuItem documentItem = partyItem.addItem(DOCUMENTS_TEXT, VaadinIcons.GROUP, null); documentItem.addItem(DOCUMENT_ACTIVITY_TEXT, VaadinIcons.GROUP, @@ -259,24 +176,25 @@ public void createPartyMenuBar(final MenuBar menuBar, final String pageId) { ballotItem.addItem(VOTE_HISTORY, VaadinIcons.GROUP, new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, PartyPageMode.VOTEHISTORY.toString(), pageId)); - ballotItem.addItem(BALLOT_DECISION_SUMMARY_TEXT, VaadinIcons.GROUP, new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, - PartyPageMode.COMMITTEEBALLOTDECISIONSUMMARY.toString(), pageId)); - - ballotItem.addItem(PARTY_WON_DAILY_SUMMARY_CHART, VaadinIcons.GROUP, new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, - PartyPageMode.PARTYWONDAILYSUMMARYCHART.toString(), pageId)); + ballotItem.addItem(BALLOT_DECISION_SUMMARY_TEXT, VaadinIcons.GROUP, + new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, + PartyPageMode.COMMITTEEBALLOTDECISIONSUMMARY.toString(), pageId)); + ballotItem.addItem(PARTY_WON_DAILY_SUMMARY_CHART, VaadinIcons.GROUP, + new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, + PartyPageMode.PARTYWONDAILYSUMMARYCHART.toString(), pageId)); - ballotItem.addItem(PartyPageMode.PARTYAGAINSTCOALATIONSSUMMARY.toString(), VaadinIcons.GROUP, new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, - PartyPageMode.PARTYAGAINSTCOALATIONSSUMMARY.toString(), pageId)); - - ballotItem.addItem(PartyPageMode.PARTYSUPPORTSUMMARY.toString(), VaadinIcons.GROUP, new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, - PartyPageMode.PARTYSUPPORTSUMMARY.toString(), pageId)); + ballotItem.addItem(PartyPageMode.PARTYAGAINSTCOALATIONSSUMMARY.toString(), VaadinIcons.GROUP, + new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, + PartyPageMode.PARTYAGAINSTCOALATIONSSUMMARY.toString(), pageId)); + ballotItem.addItem(PartyPageMode.PARTYSUPPORTSUMMARY.toString(), VaadinIcons.GROUP, + new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, + PartyPageMode.PARTYSUPPORTSUMMARY.toString(), pageId)); partyItem.addItem(PAGE_VISIT_HISTORY_TEXT, VaadinIcons.GROUP, new PageModeMenuCommand(UserViews.PARTY_VIEW_NAME, PageMode.PAGEVISITHISTORY, pageId)); } - } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/PartyRankingMenuItemFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/PartyRankingMenuItemFactoryImpl.java index ee91d171e8..0e3930f7ee 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/PartyRankingMenuItemFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/PartyRankingMenuItemFactoryImpl.java @@ -23,11 +23,7 @@ import com.hack23.cia.web.impl.ui.application.views.common.menufactory.api.ApplicationMenuItemFactory; import com.hack23.cia.web.impl.ui.application.views.common.menufactory.api.PartyRankingMenuItemFactory; -import com.hack23.cia.web.impl.ui.application.views.common.pagelinks.api.PageModeMenuCommand; import com.hack23.cia.web.impl.ui.application.views.common.rows.RowUtil; -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; import com.jarektoro.responsivelayout.ResponsiveRow; import com.vaadin.icons.VaadinIcons; import com.vaadin.ui.MenuBar; @@ -46,133 +42,104 @@ *

*/ @Service -public final class PartyRankingMenuItemFactoryImpl extends AbstractMenuItemFactoryImpl implements PartyRankingMenuItemFactory { - - // Label constants - private static final String PART_LEADERS_SCOREBOARD = "Party leaders scoreboard"; - private static final String ALL_PARTIES_TOTAL_DAYS_SERVED_IN_PARLIAMENT = "All parties total days served in parliament"; - private static final String CHART_BY_TOPIC_TEXT = "Chart by topic"; - private static final String CURRENT_PARTIES_ACTIVE_IN_COMMITTEES_HEAD_COUNT = "Current parties in committees"; - private static final String CURRENT_PARTIES_ACTIVE_IN_MINISTRIES_HEAD_COUNT_TEXT = "Current parties in government"; - private static final String CURRENT_PARTIES_ACTIVE_IN_PARLIAMENT_HEAD_COUNT = "Current parties in parliament"; - private static final String OVERVIEW_TEXT = "Overview"; - private static final String PAGE_VISIT_HISTORY_TEXT = "Page Visit History"; - private static final String PARTY_BY_TOTAL_MEMBERS_BASED_ON_ROLES_IN_DEPARTMENTS_COMMITTEES_AND_PARLIAMENT = - "Party by total members across EU/gov/committees/parliament"; - private static final String PARTY_RANKING = "Party Ranking"; - private static final String TOTAL_MEMBERS = "Total members"; - - // Political analyst perspective descriptions (~50 chars) - private static final String DESC_ALL_PARTIES_ROLES = "All parties: influence across key institutions."; - private static final String DESC_GOVERNMENT_HEADCOUNT = "Governing parties: evaluating institutional strength."; - private static final String DESC_COMMITTEES_HEADCOUNT = "Committees: parties' agenda-setting influence."; - private static final String DESC_PARLIAMENT_HEADCOUNT = "Parliament: mapping party legislative leverage."; - private static final String DESC_LEADERS_SCOREBOARD = "Leaders: comparing party leadership impact."; - private static final String DESC_DAYS_SERVED_PARLIAMENT = "All parties: experience shaping policy timelines."; - private static final String DESC_PAGE_VISIT_HISTORY = "Visit history: tracking public engagement patterns."; - - // Page mode commands - private static final PageModeMenuCommand COMMAND_CHARTS_ALL_PARTIES = new PageModeMenuCommand(UserViews.PARTY_RANKING_VIEW_NAME, PageMode.CHARTS, ChartIndicators.ALLPARTIES.toString()); - private static final PageModeMenuCommand COMMAND_CHARTS_CURRENT_COMMITTEES = new PageModeMenuCommand(UserViews.PARTY_RANKING_VIEW_NAME, PageMode.CHARTS, ChartIndicators.CURRENTCOMMITTEES.toString()); - private static final PageModeMenuCommand COMMAND_CHARTS_CURRENT_GOVERNMENT_PARTIES = new PageModeMenuCommand(UserViews.PARTY_RANKING_VIEW_NAME, PageMode.CHARTS, ChartIndicators.CURRENTGOVERMENTPARTIES.toString()); - private static final PageModeMenuCommand COMMAND_CHARTS_CURRENT_PARTIES = new PageModeMenuCommand(UserViews.PARTY_RANKING_VIEW_NAME, PageMode.CHARTS, ChartIndicators.CURRENTPARTIES.toString()); - private static final PageModeMenuCommand COMMAND_CHARTS_CURRENT_PARTIES_LEADER_SCOREBOARD = new PageModeMenuCommand(UserViews.PARTY_RANKING_VIEW_NAME, PageMode.CHARTS, ChartIndicators.CURRENTPARTYLEADERSCORECARD.toString()); - private static final PageModeMenuCommand COMMAND_DATAGRID = new PageModeMenuCommand(UserViews.PARTY_RANKING_VIEW_NAME, PageMode.DATAGRID); - private static final PageModeMenuCommand COMMAND_OVERVIEW = new PageModeMenuCommand(UserViews.PARTY_RANKING_VIEW_NAME, PageMode.OVERVIEW); - private static final PageModeMenuCommand COMMAND_PAGEVISITHISTORY = new PageModeMenuCommand(UserViews.PARTY_RANKING_VIEW_NAME, PageMode.PAGEVISITHISTORY); - - /** Application menu item factory for integrating ranking menus. */ - @Autowired - private ApplicationMenuItemFactory applicationMenuItemFactory; - - /** - * Instantiates a new party ranking menu item factory implementation. - */ - public PartyRankingMenuItemFactoryImpl() { - super(); - } - - /** - * Creates the overview page with concise, politically focused descriptions. - * Each button link is accompanied by ~50 character descriptions highlighting - * political context rather than technical details. - * - * @param panelContent the vertical layout to hold the overview content - */ - @Override - public void createOverviewPage(final VerticalLayout panelContent) { - final ResponsiveRow grid = RowUtil.createGridLayout(panelContent); - - createButtonLink(grid, PART_LEADERS_SCOREBOARD, VaadinIcons.TROPHY, - COMMAND_CHARTS_CURRENT_PARTIES_LEADER_SCOREBOARD, DESC_LEADERS_SCOREBOARD); - - createButtonLink(grid, TOTAL_MEMBERS, VaadinIcons.USERS, - COMMAND_DATAGRID, DESC_ALL_PARTIES_ROLES); - - createButtonLink(grid, CURRENT_PARTIES_ACTIVE_IN_MINISTRIES_HEAD_COUNT_TEXT, VaadinIcons.INSTITUTION, - COMMAND_CHARTS_CURRENT_GOVERNMENT_PARTIES, DESC_GOVERNMENT_HEADCOUNT); - - createButtonLink(grid, CURRENT_PARTIES_ACTIVE_IN_COMMITTEES_HEAD_COUNT, VaadinIcons.GROUP, - COMMAND_CHARTS_CURRENT_COMMITTEES, DESC_COMMITTEES_HEADCOUNT); - - createButtonLink(grid, CURRENT_PARTIES_ACTIVE_IN_PARLIAMENT_HEAD_COUNT, VaadinIcons.INSTITUTION, - COMMAND_CHARTS_CURRENT_PARTIES, DESC_PARLIAMENT_HEADCOUNT); - - - createButtonLink(grid, ALL_PARTIES_TOTAL_DAYS_SERVED_IN_PARLIAMENT, VaadinIcons.CLOCK, - COMMAND_CHARTS_ALL_PARTIES, DESC_DAYS_SERVED_PARLIAMENT); - - createButtonLink(grid, PAGE_VISIT_HISTORY_TEXT, VaadinIcons.CHART, - COMMAND_PAGEVISITHISTORY, DESC_PAGE_VISIT_HISTORY); - } - - /** - * Creates the party ranking menu bar and integrates it into the main application - * menu. Ensures consistent icon usage and logical grouping of party ranking - * topics. - * - * @param menuBar the main menu bar to which the party ranking items will be added - */ - @Override - public void createPartyRankingMenuBar(final MenuBar menuBar) { - initApplicationMenuBar(menuBar); - applicationMenuItemFactory.addRankingMenu(menuBar); - - // Suitable icon (e.g., LINE_CHART) for ranking visualization - createPartyRankingTopics(menuBar.addItem(PARTY_RANKING, VaadinIcons.LINE_CHART, null)); - } - - /** - * Adds party ranking topics to the specified menu item. Uses icons that reflect - * the content context, such as charts for data visualization, groups or - * institutions for organizational structures, and history for past activity. - * - * @param partynMenuItem the parent menu item to which party ranking topics are added - */ - @Override - public void createPartyRankingTopics(final MenuItem partynMenuItem) { - partynMenuItem.addItem(OVERVIEW_TEXT, VaadinIcons.DASHBOARD, COMMAND_OVERVIEW); - - partynMenuItem.addItem(PART_LEADERS_SCOREBOARD, VaadinIcons.TROPHY,COMMAND_CHARTS_CURRENT_PARTIES_LEADER_SCOREBOARD); - - // Total members using USERS icon for multiple people - final MenuItem listItem = partynMenuItem.addItem(TOTAL_MEMBERS, VaadinIcons.USERS, COMMAND_DATAGRID); - listItem.setDescription(PARTY_BY_TOTAL_MEMBERS_BASED_ON_ROLES_IN_DEPARTMENTS_COMMITTEES_AND_PARLIAMENT); - - final MenuItem chartByTopic = partynMenuItem.addItem(CHART_BY_TOPIC_TEXT, VaadinIcons.CHART, null); - - chartByTopic.addItem(CURRENT_PARTIES_ACTIVE_IN_MINISTRIES_HEAD_COUNT_TEXT, VaadinIcons.INSTITUTION, - COMMAND_CHARTS_CURRENT_GOVERNMENT_PARTIES); - - chartByTopic.addItem(CURRENT_PARTIES_ACTIVE_IN_COMMITTEES_HEAD_COUNT, VaadinIcons.GROUP, - COMMAND_CHARTS_CURRENT_COMMITTEES); - - chartByTopic.addItem(CURRENT_PARTIES_ACTIVE_IN_PARLIAMENT_HEAD_COUNT, VaadinIcons.INSTITUTION, - COMMAND_CHARTS_CURRENT_PARTIES); - - chartByTopic.addItem(ALL_PARTIES_TOTAL_DAYS_SERVED_IN_PARLIAMENT, VaadinIcons.CLOCK, - COMMAND_CHARTS_ALL_PARTIES); - - partynMenuItem.addItem(PAGE_VISIT_HISTORY_TEXT, VaadinIcons.CHART, COMMAND_PAGEVISITHISTORY); - } +public final class PartyRankingMenuItemFactoryImpl extends AbstractMenuItemFactoryImpl + implements PartyRankingMenuItemFactory { + + /** Application menu item factory for integrating ranking menus. */ + @Autowired + private ApplicationMenuItemFactory applicationMenuItemFactory; + + /** + * Instantiates a new party ranking menu item factory implementation. + */ + public PartyRankingMenuItemFactoryImpl() { + super(); + } + + /** + * Creates the overview page with concise, politically focused descriptions. + * Each button link is accompanied by ~50 character descriptions highlighting + * political context rather than technical details. + * + * @param panelContent the vertical layout to hold the overview content + */ + @Override + public void createOverviewPage(final VerticalLayout panelContent) { + final ResponsiveRow grid = RowUtil.createGridLayout(panelContent); + + createButtonLink(grid, PART_LEADERS_SCOREBOARD, VaadinIcons.TROPHY, + COMMAND_CHARTS_CURRENT_PARTIES_LEADER_SCOREBOARD, DESC_LEADERS_SCOREBOARD); + + createButtonLink(grid, TOTAL_MEMBERS, VaadinIcons.USERS, + COMMAND_DATAGRID, DESC_ALL_PARTIES_ROLES); + + createButtonLink(grid, CURRENT_PARTIES_ACTIVE_IN_MINISTRIES_HEAD_COUNT_TEXT, VaadinIcons.INSTITUTION, + COMMAND_CHARTS_CURRENT_GOVERNMENT_PARTIES, DESC_GOVERNMENT_HEADCOUNT); + + createButtonLink(grid, CURRENT_PARTIES_ACTIVE_IN_COMMITTEES_HEAD_COUNT, VaadinIcons.GROUP, + COMMAND_CHARTS_CURRENT_COMMITTEES, DESC_COMMITTEES_HEADCOUNT); + + createButtonLink(grid, CURRENT_PARTIES_ACTIVE_IN_PARLIAMENT_HEAD_COUNT, VaadinIcons.INSTITUTION, + COMMAND_CHARTS_CURRENT_PARTIES, DESC_PARLIAMENT_HEADCOUNT); + + createButtonLink(grid, ALL_PARTIES_TOTAL_DAYS_SERVED_IN_PARLIAMENT, VaadinIcons.CLOCK, + COMMAND_CHARTS_ALL_PARTIES, DESC_DAYS_SERVED_PARLIAMENT); + + createButtonLink(grid, PAGE_VISIT_HISTORY_TEXT, VaadinIcons.CHART, + COMMAND_PAGEVISITHISTORY, DESC_PAGE_VISIT_HISTORY); + } + + /** + * Creates the party ranking menu bar and integrates it into the main + * application + * menu. Ensures consistent icon usage and logical grouping of party ranking + * topics. + * + * @param menuBar the main menu bar to which the party ranking items will be + * added + */ + @Override + public void createPartyRankingMenuBar(final MenuBar menuBar) { + initApplicationMenuBar(menuBar); + applicationMenuItemFactory.addRankingMenu(menuBar); + + // Suitable icon (e.g., LINE_CHART) for ranking visualization + createPartyRankingTopics(menuBar.addItem(PARTY_RANKING, VaadinIcons.LINE_CHART, null)); + } + + /** + * Adds party ranking topics to the specified menu item. Uses icons that reflect + * the content context, such as charts for data visualization, groups or + * institutions for organizational structures, and history for past activity. + * + * @param partynMenuItem the parent menu item to which party ranking topics are + * added + */ + @Override + public void createPartyRankingTopics(final MenuItem partynMenuItem) { + partynMenuItem.addItem(OVERVIEW_TEXT, VaadinIcons.DASHBOARD, COMMAND_OVERVIEW); + + partynMenuItem.addItem(PART_LEADERS_SCOREBOARD, VaadinIcons.TROPHY, + COMMAND_CHARTS_CURRENT_PARTIES_LEADER_SCOREBOARD); + + // Total members using USERS icon for multiple people + final MenuItem listItem = partynMenuItem.addItem(TOTAL_MEMBERS, VaadinIcons.USERS, COMMAND_DATAGRID); + listItem.setDescription(PARTY_BY_TOTAL_MEMBERS_BASED_ON_ROLES_IN_DEPARTMENTS_COMMITTEES_AND_PARLIAMENT); + + final MenuItem chartByTopic = partynMenuItem.addItem(CHART_BY_TOPIC_TEXT, VaadinIcons.CHART, null); + + chartByTopic.addItem(CURRENT_PARTIES_ACTIVE_IN_MINISTRIES_HEAD_COUNT_TEXT, VaadinIcons.INSTITUTION, + COMMAND_CHARTS_CURRENT_GOVERNMENT_PARTIES); + + chartByTopic.addItem(CURRENT_PARTIES_ACTIVE_IN_COMMITTEES_HEAD_COUNT, VaadinIcons.GROUP, + COMMAND_CHARTS_CURRENT_COMMITTEES); + + chartByTopic.addItem(CURRENT_PARTIES_ACTIVE_IN_PARLIAMENT_HEAD_COUNT, VaadinIcons.INSTITUTION, + COMMAND_CHARTS_CURRENT_PARTIES); + + chartByTopic.addItem(ALL_PARTIES_TOTAL_DAYS_SERVED_IN_PARLIAMENT, VaadinIcons.CLOCK, + COMMAND_CHARTS_ALL_PARTIES); + + partynMenuItem.addItem(PAGE_VISIT_HISTORY_TEXT, VaadinIcons.CHART, COMMAND_PAGEVISITHISTORY); + } } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/PoliticianMenuItemFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/PoliticianMenuItemFactoryImpl.java index b641ce00a7..8c6b4ef239 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/PoliticianMenuItemFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/PoliticianMenuItemFactoryImpl.java @@ -38,172 +38,181 @@ /** * The Class PoliticianMenuItemFactoryImpl. * - *

This class builds menus and overview pages for politician-related views, + *

+ * This class builds menus and overview pages for politician-related views, * enabling users to navigate through indicators, roles, document activities, - * vote histories, and more. It integrates with {@link ApplicationMenuItemFactory} + * vote histories, and more. It integrates with + * {@link ApplicationMenuItemFactory} * and {@link PoliticianRankingMenuItemFactory} to ensure consistent menu - * structures within the application.

+ * structures within the application. + *

*/ @Service public final class PoliticianMenuItemFactoryImpl extends AbstractMenuItemFactoryImpl - implements PoliticianMenuItemFactory { - - /** Menu labels. */ - private static final String BALLOT_DECISION_SUMMARY_TEXT = "Ballot Decision Summary"; - private static final String BALLOTS_TEXT = "Ballots"; - private static final String DOCUMENT_ACTIVITY_TEXT = "Document Activity"; - private static final String DOCUMENT_HISTORY_TEXT = "Document History"; - private static final String DOCUMENTS_TEXT = "Documents"; - private static final String INDICATORS_TEXT = "Indicators"; - private static final String OVERVIEW_TEXT = "Overview"; - private static final String PAGE_VISIT_HISTORY_TEXT = "Page Visit History"; - private static final String POLITICIAN_RANKING = "Politician Ranking"; - private static final String ROLE_GHANT_TEXT = "Role Gantt"; - private static final String ROLE_LIST = "Role List"; - private static final String ROLES_TEXT = "Roles"; - private static final String TOTAL_EXPERIENCE = "Total Experience"; - private static final String VOTE_HISTORY = "Vote History"; - - /** Descriptions (~50 characters). */ - private static final String INDICATORS_DESCRIPTION = "Key performance indicators."; - private static final String TOTAL_EXPERIENCE_DESCRIPTION = "Summary of political experience."; - private static final String ROLE_LIST_DESCRIPTION = "Detailed list of roles."; - private static final String ROLE_GHANT_DESCRIPTION = "Gantt chart of roles."; - private static final String DOCUMENT_ACTIVITY_DESCRIPTION = "Activity by document type."; - private static final String DOCUMENT_HISTORY_DESCRIPTION = "History of document access."; - private static final String VOTE_HISTORY_DESCRIPTION = "Summary of voting records."; - private static final String BALLOT_DECISION_SUMMARY_DESCRIPTION = "Overview of ballot decisions."; - private static final String PAGE_VISIT_HISTORY_DESCRIPTION = "History of page visits."; - - /** The application menu item factory. */ - @Autowired - private ApplicationMenuItemFactory applicationMenuItemFactory; - - /** The politician ranking menu item factory. */ - @Autowired - private PoliticianRankingMenuItemFactory politicianRankingMenuItemFactory; - - /** - * Instantiates a new politician menu item factory impl. - */ - public PoliticianMenuItemFactoryImpl() { - super(); - } - - /** - * Creates the overview page with quick-access links to various politician-related - * views such as indicators, roles, document activities, and vote histories. - * - * @param panelContent the {@link VerticalLayout} container that holds the overview - * content. New UI components (buttons/links) will be added here. - * @param pageId the identifier for the current page context. - */ - @Override - public void createOverviewPage(final VerticalLayout panelContent, final String pageId) { - final ResponsiveRow grid = RowUtil.createGridLayout(panelContent); - - createButtonLink(grid, INDICATORS_TEXT, VaadinIcons.CHART, - new PageModeMenuCommand(UserViews.POLITICIAN_VIEW_NAME, PageMode.INDICATORS, pageId), - INDICATORS_DESCRIPTION); - - createButtonLink(grid, TOTAL_EXPERIENCE, VaadinIcons.USER_CLOCK, - new PageModeMenuCommand(UserViews.POLITICIAN_VIEW_NAME, - PoliticianPageMode.ROLESUMMARY.toString(), pageId), - TOTAL_EXPERIENCE_DESCRIPTION); - - createButtonLink(grid, ROLE_LIST, VaadinIcons.LIST, - new PageModeMenuCommand(UserViews.POLITICIAN_VIEW_NAME, - PoliticianPageMode.ROLELIST.toString(), pageId), - ROLE_LIST_DESCRIPTION); - - createButtonLink(grid, ROLE_GHANT_TEXT, VaadinIcons.USER_CLOCK, - new PageModeMenuCommand(UserViews.POLITICIAN_VIEW_NAME, - PoliticianPageMode.ROLEGHANT.toString(), pageId), - ROLE_GHANT_DESCRIPTION); - - createButtonLink(grid, DOCUMENT_ACTIVITY_TEXT, VaadinIcons.FILE_TEXT, - new PageModeMenuCommand(UserViews.POLITICIAN_VIEW_NAME, - PoliticianPageMode.DOCUMENTACTIVITY.toString(), pageId), - DOCUMENT_ACTIVITY_DESCRIPTION); - - createButtonLink(grid, DOCUMENT_HISTORY_TEXT, VaadinIcons.CHART, - new PageModeMenuCommand(UserViews.POLITICIAN_VIEW_NAME, - PoliticianPageMode.DOCUMENTHISTORY.toString(), pageId), - DOCUMENT_HISTORY_DESCRIPTION); - - createButtonLink(grid, VOTE_HISTORY, VaadinIcons.CHECK_CIRCLE, - new PageModeMenuCommand(UserViews.POLITICIAN_VIEW_NAME, - PoliticianPageMode.VOTEHISTORY.toString(), pageId), - VOTE_HISTORY_DESCRIPTION); - - createButtonLink(grid, BALLOT_DECISION_SUMMARY_TEXT, VaadinIcons.CHECK, - new PageModeMenuCommand(UserViews.POLITICIAN_VIEW_NAME, - PoliticianPageMode.BALLOTDECISIONSUMMARY.toString(), pageId), - BALLOT_DECISION_SUMMARY_DESCRIPTION); - - createButtonLink(grid, PAGE_VISIT_HISTORY_TEXT, VaadinIcons.CHART, - new PageModeMenuCommand(UserViews.POLITICIAN_VIEW_NAME, PageMode.PAGEVISITHISTORY, pageId), - PAGE_VISIT_HISTORY_DESCRIPTION); - } - - /** - * Creates the politician menu bar and integrates it into the main application menu. - * Adds politician ranking topics and specific politician-related menu items. - * - * @param menuBar the main application {@link MenuBar} to which the politician - * menu will be added. - * @param pageId the identifier for the current page context. - */ - @Override - public void createPoliticianMenuBar(final MenuBar menuBar, final String pageId) { - initApplicationMenuBar(menuBar); - applicationMenuItemFactory.addRankingMenu(menuBar); - politicianRankingMenuItemFactory.createPoliticianRankingTopics( - menuBar.addItem(POLITICIAN_RANKING, VaadinIcons.USER, null)); - - final MenuItem politicianItem = menuBar.addItem("Politician " + pageId, VaadinIcons.USER, null); - - politicianItem.addItem(OVERVIEW_TEXT, VaadinIcons.DASHBOARD, - new PageModeMenuCommand(UserViews.POLITICIAN_VIEW_NAME, PageMode.OVERVIEW, pageId)); - - politicianItem.addItem(INDICATORS_TEXT, VaadinIcons.CHART, - new PageModeMenuCommand(UserViews.POLITICIAN_VIEW_NAME, PageMode.INDICATORS, pageId)); - - final MenuItem rolesItem = politicianItem.addItem(ROLES_TEXT, VaadinIcons.TAGS, null); - - rolesItem.addItem(TOTAL_EXPERIENCE, VaadinIcons.USER_CLOCK, - new PageModeMenuCommand(UserViews.POLITICIAN_VIEW_NAME, - PoliticianPageMode.ROLESUMMARY.toString(), pageId)); - - rolesItem.addItem(ROLE_LIST, VaadinIcons.LIST, - new PageModeMenuCommand(UserViews.POLITICIAN_VIEW_NAME, - PoliticianPageMode.ROLELIST.toString(), pageId)); - - rolesItem.addItem(ROLE_GHANT_TEXT, VaadinIcons.USER_CLOCK, - new PageModeMenuCommand(UserViews.POLITICIAN_VIEW_NAME, - PoliticianPageMode.ROLEGHANT.toString(), pageId)); - - final MenuItem documentItem = politicianItem.addItem(DOCUMENTS_TEXT, VaadinIcons.FILE_TEXT, null); - - documentItem.addItem(DOCUMENT_ACTIVITY_TEXT, VaadinIcons.FILE_TEXT, - new PageModeMenuCommand(UserViews.POLITICIAN_VIEW_NAME, - PoliticianPageMode.DOCUMENTACTIVITY.toString(), pageId)); - - documentItem.addItem(DOCUMENT_HISTORY_TEXT, VaadinIcons.CHART, - new PageModeMenuCommand(UserViews.POLITICIAN_VIEW_NAME, - PoliticianPageMode.DOCUMENTHISTORY.toString(), pageId)); - - final MenuItem ballotItem = politicianItem.addItem(BALLOTS_TEXT, VaadinIcons.CHECK, null); - - ballotItem.addItem(VOTE_HISTORY, VaadinIcons.CHECK_CIRCLE, - new PageModeMenuCommand(UserViews.POLITICIAN_VIEW_NAME, - PoliticianPageMode.VOTEHISTORY.toString(), pageId)); - - ballotItem.addItem(BALLOT_DECISION_SUMMARY_TEXT, VaadinIcons.CHECK, - new PageModeMenuCommand(UserViews.POLITICIAN_VIEW_NAME, - PoliticianPageMode.BALLOTDECISIONSUMMARY.toString(), pageId)); - - politicianItem.addItem(PAGE_VISIT_HISTORY_TEXT, VaadinIcons.CHART, - new PageModeMenuCommand(UserViews.POLITICIAN_VIEW_NAME, PageMode.PAGEVISITHISTORY, pageId)); - } + implements PoliticianMenuItemFactory { + + /** Menu labels. */ + private static final String BALLOT_DECISION_SUMMARY_TEXT = "Ballot Decision Summary"; + private static final String BALLOTS_TEXT = "Ballots"; + private static final String DOCUMENT_ACTIVITY_TEXT = "Document Activity"; + private static final String DOCUMENT_HISTORY_TEXT = "Document History"; + private static final String DOCUMENTS_TEXT = "Documents"; + private static final String INDICATORS_TEXT = "Indicators"; + private static final String OVERVIEW_TEXT = "Overview"; + private static final String PAGE_VISIT_HISTORY_TEXT = "Page Visit History"; + private static final String POLITICIAN_RANKING = "Politician Ranking"; + private static final String ROLE_GHANT_TEXT = "Role Gantt"; + private static final String ROLE_LIST = "Role List"; + private static final String ROLES_TEXT = "Roles"; + private static final String TOTAL_EXPERIENCE = "Total Experience"; + private static final String VOTE_HISTORY = "Vote History"; + + /** Descriptions (~50 characters). */ + private static final String INDICATORS_DESCRIPTION = "Key performance indicators."; + private static final String TOTAL_EXPERIENCE_DESCRIPTION = "Summary of political experience."; + private static final String ROLE_LIST_DESCRIPTION = "Detailed list of roles."; + private static final String ROLE_GHANT_DESCRIPTION = "Gantt chart of roles."; + private static final String DOCUMENT_ACTIVITY_DESCRIPTION = "Activity by document type."; + private static final String DOCUMENT_HISTORY_DESCRIPTION = "History of document access."; + private static final String VOTE_HISTORY_DESCRIPTION = "Summary of voting records."; + private static final String BALLOT_DECISION_SUMMARY_DESCRIPTION = "Overview of ballot decisions."; + private static final String PAGE_VISIT_HISTORY_DESCRIPTION = "History of page visits."; + + /** The application menu item factory. */ + @Autowired + private ApplicationMenuItemFactory applicationMenuItemFactory; + + /** The politician ranking menu item factory. */ + @Autowired + private PoliticianRankingMenuItemFactory politicianRankingMenuItemFactory; + + /** + * Instantiates a new politician menu item factory impl. + */ + public PoliticianMenuItemFactoryImpl() { + super(); + } + + /** + * Creates the overview page with quick-access links to various + * politician-related + * views such as indicators, roles, document activities, and vote histories. + * + * @param panelContent the {@link VerticalLayout} container that holds the + * overview + * content. New UI components (buttons/links) will be added + * here. + * @param pageId the identifier for the current page context. + */ + @Override + public void createOverviewPage(final VerticalLayout panelContent, final String pageId) { + final ResponsiveRow grid = RowUtil.createGridLayout(panelContent); + + createButtonLink(grid, INDICATORS_TEXT, VaadinIcons.CHART, + new PageModeMenuCommand(UserViews.POLITICIAN_VIEW_NAME, PageMode.INDICATORS, pageId), + INDICATORS_DESCRIPTION); + + createButtonLink(grid, TOTAL_EXPERIENCE, VaadinIcons.USER_CLOCK, + new PageModeMenuCommand(UserViews.POLITICIAN_VIEW_NAME, + PoliticianPageMode.ROLESUMMARY.toString(), pageId), + TOTAL_EXPERIENCE_DESCRIPTION); + + createButtonLink(grid, ROLE_LIST, VaadinIcons.LIST, + new PageModeMenuCommand(UserViews.POLITICIAN_VIEW_NAME, + PoliticianPageMode.ROLELIST.toString(), pageId), + ROLE_LIST_DESCRIPTION); + + createButtonLink(grid, ROLE_GHANT_TEXT, VaadinIcons.USER_CLOCK, + new PageModeMenuCommand(UserViews.POLITICIAN_VIEW_NAME, + PoliticianPageMode.ROLEGHANT.toString(), pageId), + ROLE_GHANT_DESCRIPTION); + + createButtonLink(grid, DOCUMENT_ACTIVITY_TEXT, VaadinIcons.FILE_TEXT, + new PageModeMenuCommand(UserViews.POLITICIAN_VIEW_NAME, + PoliticianPageMode.DOCUMENTACTIVITY.toString(), pageId), + DOCUMENT_ACTIVITY_DESCRIPTION); + + createButtonLink(grid, DOCUMENT_HISTORY_TEXT, VaadinIcons.CHART, + new PageModeMenuCommand(UserViews.POLITICIAN_VIEW_NAME, + PoliticianPageMode.DOCUMENTHISTORY.toString(), pageId), + DOCUMENT_HISTORY_DESCRIPTION); + + createButtonLink(grid, VOTE_HISTORY, VaadinIcons.CHECK_CIRCLE, + new PageModeMenuCommand(UserViews.POLITICIAN_VIEW_NAME, + PoliticianPageMode.VOTEHISTORY.toString(), pageId), + VOTE_HISTORY_DESCRIPTION); + + createButtonLink(grid, BALLOT_DECISION_SUMMARY_TEXT, VaadinIcons.CHECK, + new PageModeMenuCommand(UserViews.POLITICIAN_VIEW_NAME, + PoliticianPageMode.BALLOTDECISIONSUMMARY.toString(), pageId), + BALLOT_DECISION_SUMMARY_DESCRIPTION); + + createButtonLink(grid, PAGE_VISIT_HISTORY_TEXT, VaadinIcons.CHART, + new PageModeMenuCommand(UserViews.POLITICIAN_VIEW_NAME, PageMode.PAGEVISITHISTORY, + pageId), + PAGE_VISIT_HISTORY_DESCRIPTION); + } + + /** + * Creates the politician menu bar and integrates it into the main application + * menu. + * Adds politician ranking topics and specific politician-related menu items. + * + * @param menuBar the main application {@link MenuBar} to which the politician + * menu will be added. + * @param pageId the identifier for the current page context. + */ + @Override + public void createPoliticianMenuBar(final MenuBar menuBar, final String pageId) { + initApplicationMenuBar(menuBar); + applicationMenuItemFactory.addRankingMenu(menuBar); + politicianRankingMenuItemFactory.createPoliticianRankingTopics( + menuBar.addItem(POLITICIAN_RANKING, VaadinIcons.USER, null)); + + final MenuItem politicianItem = menuBar.addItem("Politician " + pageId, VaadinIcons.USER, null); + + politicianItem.addItem(OVERVIEW_TEXT, VaadinIcons.DASHBOARD, + new PageModeMenuCommand(UserViews.POLITICIAN_VIEW_NAME, PageMode.OVERVIEW, pageId)); + + politicianItem.addItem(INDICATORS_TEXT, VaadinIcons.CHART, + new PageModeMenuCommand(UserViews.POLITICIAN_VIEW_NAME, PageMode.INDICATORS, pageId)); + + final MenuItem rolesItem = politicianItem.addItem(ROLES_TEXT, VaadinIcons.TAGS, null); + + rolesItem.addItem(TOTAL_EXPERIENCE, VaadinIcons.USER_CLOCK, + new PageModeMenuCommand(UserViews.POLITICIAN_VIEW_NAME, + PoliticianPageMode.ROLESUMMARY.toString(), pageId)); + + rolesItem.addItem(ROLE_LIST, VaadinIcons.LIST, + new PageModeMenuCommand(UserViews.POLITICIAN_VIEW_NAME, + PoliticianPageMode.ROLELIST.toString(), pageId)); + + rolesItem.addItem(ROLE_GHANT_TEXT, VaadinIcons.USER_CLOCK, + new PageModeMenuCommand(UserViews.POLITICIAN_VIEW_NAME, + PoliticianPageMode.ROLEGHANT.toString(), pageId)); + + final MenuItem documentItem = politicianItem.addItem(DOCUMENTS_TEXT, VaadinIcons.FILE_TEXT, null); + + documentItem.addItem(DOCUMENT_ACTIVITY_TEXT, VaadinIcons.FILE_TEXT, + new PageModeMenuCommand(UserViews.POLITICIAN_VIEW_NAME, + PoliticianPageMode.DOCUMENTACTIVITY.toString(), pageId)); + + documentItem.addItem(DOCUMENT_HISTORY_TEXT, VaadinIcons.CHART, + new PageModeMenuCommand(UserViews.POLITICIAN_VIEW_NAME, + PoliticianPageMode.DOCUMENTHISTORY.toString(), pageId)); + + final MenuItem ballotItem = politicianItem.addItem(BALLOTS_TEXT, VaadinIcons.CHECK, null); + + ballotItem.addItem(VOTE_HISTORY, VaadinIcons.CHECK_CIRCLE, + new PageModeMenuCommand(UserViews.POLITICIAN_VIEW_NAME, + PoliticianPageMode.VOTEHISTORY.toString(), pageId)); + + ballotItem.addItem(BALLOT_DECISION_SUMMARY_TEXT, VaadinIcons.CHECK, + new PageModeMenuCommand(UserViews.POLITICIAN_VIEW_NAME, + PoliticianPageMode.BALLOTDECISIONSUMMARY.toString(), pageId)); + + politicianItem.addItem(PAGE_VISIT_HISTORY_TEXT, VaadinIcons.CHART, + new PageModeMenuCommand(UserViews.POLITICIAN_VIEW_NAME, PageMode.PAGEVISITHISTORY, + pageId)); + } } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/UserHomeMenuItemFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/UserHomeMenuItemFactoryImpl.java index 24246cacaf..e35b98e02c 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/UserHomeMenuItemFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/UserHomeMenuItemFactoryImpl.java @@ -40,27 +40,6 @@ @Service public final class UserHomeMenuItemFactoryImpl extends AbstractMenuItemFactoryImpl implements UserHomeMenuItemFactory { - /** The Constant OVERVIEW_TEXT. */ - private static final String OVERVIEW_TEXT = "Overview"; - - /** The Constant SECURITY_SETTING_TEXT. */ - private static final String SECURITY_SETTING_TEXT = "Security settings"; - - /** The Constant USER_EVENTS. */ - private static final String USER_EVENTS = "User Events"; - - /** The Constant USER_VISITS. */ - private static final String USER_VISITS = "User Visits"; - - /** The Constant SECURITY_SETTINGS_DESCRIPTION. */ - private static final String SECURITY_SETTINGS_DESCRIPTION = "Security settings, enable MFA"; - - /** The Constant USER_VISITS_DESCRIPTION. */ - private static final String USER_VISITS_DESCRIPTION = "All past visits"; - - /** The Constant USER_EVENTS_DESCRIPTION. */ - private static final String USER_EVENTS_DESCRIPTION = "All past events"; - @Autowired private ApplicationMenuItemFactory applicationMenuItemFactory; @@ -71,37 +50,38 @@ public UserHomeMenuItemFactoryImpl() { super(); } - @Override public void createOverviewPage(final VerticalLayout overviewLayout) { final ResponsiveRow grid = RowUtil.createGridLayout(overviewLayout); - createButtonLink(grid,SECURITY_SETTING_TEXT, VaadinIcons.SHIELD, - new PageModeMenuCommand(UserViews.USERHOME_VIEW_NAME, UserHomePageMode.SECURITY_SETTINGS.toString(),""),SECURITY_SETTINGS_DESCRIPTION); - - createButtonLink(grid,USER_VISITS, VaadinIcons.EYE, - new PageModeMenuCommand(UserViews.USERHOME_VIEW_NAME, UserHomePageMode.USER_VISITS.toString()),USER_VISITS_DESCRIPTION); + createButtonLink(grid, SECURITY_SETTING_TEXT, VaadinIcons.SHIELD, + new PageModeMenuCommand(UserViews.USERHOME_VIEW_NAME, UserHomePageMode.SECURITY_SETTINGS.toString(), + ""), + SECURITY_SETTINGS_DESCRIPTION); - createButtonLink(grid,USER_EVENTS, VaadinIcons.CALENDAR, - new PageModeMenuCommand(UserViews.USERHOME_VIEW_NAME, UserHomePageMode.USER_EVENTS.toString()),USER_EVENTS_DESCRIPTION); + createButtonLink(grid, USER_VISITS, VaadinIcons.EYE, + new PageModeMenuCommand(UserViews.USERHOME_VIEW_NAME, UserHomePageMode.USER_VISITS.toString()), + USER_VISITS_DESCRIPTION); + createButtonLink(grid, USER_EVENTS, VaadinIcons.CALENDAR, + new PageModeMenuCommand(UserViews.USERHOME_VIEW_NAME, UserHomePageMode.USER_EVENTS.toString()), + USER_EVENTS_DESCRIPTION); } - @Override public void createUserHomeMenuBar(final MenuBar menuBar, final String pageId) { initApplicationMenuBar(menuBar); applicationMenuItemFactory.addRankingMenu(menuBar); - final MenuItem accountItem = menuBar.addItem("Useraccount", VaadinIcons.USER,null); - + final MenuItem accountItem = menuBar.addItem(USERACCOUNT, VaadinIcons.USER, null); - accountItem.addItem(OVERVIEW_TEXT, VaadinIcons.USER, + accountItem.addItem(USER_HOME_OVERVIEW_TEXT, VaadinIcons.USER, new PageModeMenuCommand(UserViews.USERHOME_VIEW_NAME, PageMode.OVERVIEW, pageId)); accountItem.addItem(SECURITY_SETTING_TEXT, VaadinIcons.SHIELD, - new PageModeMenuCommand(UserViews.USERHOME_VIEW_NAME, UserHomePageMode.SECURITY_SETTINGS.toString(), pageId)); + new PageModeMenuCommand(UserViews.USERHOME_VIEW_NAME, UserHomePageMode.SECURITY_SETTINGS.toString(), + pageId)); accountItem.addItem(USER_VISITS, VaadinIcons.EYE, new PageModeMenuCommand(UserViews.USERHOME_VIEW_NAME, UserHomePageMode.USER_VISITS.toString(), pageId)); @@ -109,7 +89,6 @@ public void createUserHomeMenuBar(final MenuBar menuBar, final String pageId) { accountItem.addItem(USER_EVENTS, VaadinIcons.CALENDAR, new PageModeMenuCommand(UserViews.USERHOME_VIEW_NAME, UserHomePageMode.USER_EVENTS.toString(), pageId)); - } } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/viewnames/ChartIndicators.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/viewnames/ChartIndicators.java index ea432b27e3..93ac08ed12 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/viewnames/ChartIndicators.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/viewnames/ChartIndicators.java @@ -85,6 +85,6 @@ public enum ChartIndicators { PARTYGENDER, /** The partywinner. */ - PARTYWINNER; + PARTYWINNER, GOVERNMENTBODIESHEADCOUNT, GOVERNMENTBODIESINCOME, GOVERNMENTBODIESEXPENDITURE, GOVERNMENTOUTCOME, ALLGOVERNMENTROLEGANTT, ALLMINISTRIESBYTOTALDAYS, RISKSUMMARY, RULEVIOLATION, DOCUMENTACTIVITY, DECISIONACTIVITY, DECISIONFLOW; } \ No newline at end of file diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/viewnames/PageMode.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/viewnames/PageMode.java index 97539b65c7..8dd0dca212 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/viewnames/PageMode.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/viewnames/PageMode.java @@ -15,7 +15,7 @@ * * $Id$ * $HeadURL$ -*/ + */ package com.hack23.cia.web.impl.ui.application.views.common.viewnames; /** @@ -32,6 +32,9 @@ public enum PageMode { /** The indicators. */ INDICATORS, + /** The list. */ + LIST, + /** The login. */ LOGIN, @@ -42,6 +45,8 @@ public enum PageMode { PAGEVISITHISTORY, /** The rules. */ - RULES + RULES, -} \ No newline at end of file + /** The search. */ + SEARCH +} diff --git a/citizen-intelligence-agency/src/main/java/module-info.java b/citizen-intelligence-agency/src/main/java/module-info.java index 1d2c751aaa..1a2649e40c 100644 --- a/citizen-intelligence-agency/src/main/java/module-info.java +++ b/citizen-intelligence-agency/src/main/java/module-info.java @@ -135,14 +135,26 @@ exports com.hack23.cia.web.impl.ui.application.views.common.chartfactory.api; exports com.hack23.cia.web.impl.ui.application.views.common; - requires vaadin.compatibility.shared; - requires vaadin.compatibility.server; - requires responsive.layout; - requires org.hibernate.orm.jpamodelgen; + // Non-modular dependencies (remove transitive) + requires transitive vaadin.compatibility.shared; + requires transitive vaadin.compatibility.server; + requires transitive responsive.layout; + requires transitive org.hibernate.orm.jpamodelgen; + requires transitive vaadin.shared; + requires transitive org.eclipse.jetty.servlet; + requires transitive jetty.servlet.api; + requires transitive vaadin.server; + + // Keep transitive for Spring and our own modules + requires transitive spring.context; + requires transitive spring.security.core; + requires transitive spring.security.web; + requires transitive spring.beans; + requires transitive com.hack23.cia.web.widgets; - requires java.persistence; - requires org.hibernate.orm.core; - requires java.transaction; + requires transitive java.persistence; + requires transitive org.hibernate.orm.core; + requires transitive java.transaction; requires ehcache; requires cache.api; @@ -176,16 +188,6 @@ requires java.management; requires java.logging; - requires transitive spring.context; - requires transitive vaadin.shared; - requires transitive spring.security.core; - requires transitive spring.security.web; - requires transitive org.eclipse.jetty.servlet; - requires transitive jetty.servlet.api; - requires transitive vaadin.server; - requires transitive spring.beans; - - requires transitive com.hack23.cia.web.widgets; requires transitive com.hack23.cia.service.api; requires transitive com.hack23.cia.service.impl; requires transitive com.hack23.cia.service.external.esv; diff --git a/model.external.riksdagen.documentcontent.impl/pom.xml b/model.external.riksdagen.documentcontent.impl/pom.xml index c8d30ea55a..4532d3ba1f 100644 --- a/model.external.riksdagen.documentcontent.impl/pom.xml +++ b/model.external.riksdagen.documentcontent.impl/pom.xml @@ -80,8 +80,9 @@ - - + + + diff --git a/model.external.riksdagen.dokumentlista.impl/pom.xml b/model.external.riksdagen.dokumentlista.impl/pom.xml index 7c596de114..0e6b53ed5b 100644 --- a/model.external.riksdagen.dokumentlista.impl/pom.xml +++ b/model.external.riksdagen.dokumentlista.impl/pom.xml @@ -20,7 +20,8 @@ https://github.com/Hack23/cia/tree/master/ - + github scm:git:ssh://git@github.com/Hack23/cia.git/model.external.riksdagen.dokumentlista.impl @@ -80,8 +81,8 @@ - - + + diff --git a/model.external.riksdagen.dokumentstatus.impl/pom.xml b/model.external.riksdagen.dokumentstatus.impl/pom.xml index ad6446b340..eec32b2293 100644 --- a/model.external.riksdagen.dokumentstatus.impl/pom.xml +++ b/model.external.riksdagen.dokumentstatus.impl/pom.xml @@ -20,7 +20,8 @@ https://github.com/Hack23/cia/tree/master/ - + github scm:git:ssh://git@github.com/Hack23/cia.git/model.external.riksdagen.dokumentstatus.impl @@ -35,8 +36,8 @@ - - + + diff --git a/model.external.riksdagen.person.impl/pom.xml b/model.external.riksdagen.person.impl/pom.xml index 25a547a909..35f99f7f2c 100644 --- a/model.external.riksdagen.person.impl/pom.xml +++ b/model.external.riksdagen.person.impl/pom.xml @@ -35,8 +35,8 @@ - - + + diff --git a/model.external.riksdagen.personlista.impl/package-info.java b/model.external.riksdagen.personlista.impl/package-info.java deleted file mode 100644 index 496a3bd96c..0000000000 --- a/model.external.riksdagen.personlista.impl/package-info.java +++ /dev/null @@ -1,19 +0,0 @@ -/** - * This package contains implementations for handling person list data from the Swedish Parliament (Riksdagen). - * - * Key classes: - * - PersonListContainer: Represents a container for person lists. - * - PersonListData: Represents data related to person lists. - * - * Dependencies and relationships: - * - Depends on com.hack23.cia.model.common.api for ModelObject interface. - * - Depends on com.hack23.cia.model.common.impl.xml for XmlDateTypeAdapter. - * - Uses javax.persistence for JPA annotations. - * - Uses javax.xml.bind.annotation for XML binding annotations. - * - Uses org.apache.commons.lang3.builder for EqualsBuilder, HashCodeBuilder, and ToStringBuilder. - * - Depends on com.hack23.cia.model.external.riksdagen.person.impl for handling person data. - * - * The package is responsible for providing the necessary structure and implementation for handling person list data from the Swedish Parliament (Riksdagen). The key classes within this package manage various aspects of person lists, such as person list containers and person list data. The package also has dependencies on other packages for specific functionalities, such as ModelObject interface, XML date type adapter, JPA annotations, XML binding annotations, and utility classes for equals, hash code, and toString methods. - */ -@javax.xml.bind.annotation.XmlSchema(namespace = "http://personlista.riksdagen.external.model.cia.hack23.com/impl") -package com.hack23.cia.model.external.riksdagen.personlista.impl; diff --git a/model.external.riksdagen.personlista.impl/pom.xml b/model.external.riksdagen.personlista.impl/pom.xml index 1cfd7ac089..5e7fbc6db5 100644 --- a/model.external.riksdagen.personlista.impl/pom.xml +++ b/model.external.riksdagen.personlista.impl/pom.xml @@ -20,7 +20,8 @@ https://github.com/Hack23/cia/tree/master/ - + github scm:git:ssh://git@github.com/Hack23/cia.git/model.external.riksdagen.personlista.impl @@ -35,8 +36,8 @@ - - + + diff --git a/model.external.riksdagen.utskottsforslag.impl/pom.xml b/model.external.riksdagen.utskottsforslag.impl/pom.xml index 31980d242a..0392438c97 100644 --- a/model.external.riksdagen.utskottsforslag.impl/pom.xml +++ b/model.external.riksdagen.utskottsforslag.impl/pom.xml @@ -35,8 +35,8 @@ - - + + diff --git a/model.external.riksdagen.votering.impl/package-info.java b/model.external.riksdagen.votering.impl/package-info.java deleted file mode 100644 index 801c850bd9..0000000000 --- a/model.external.riksdagen.votering.impl/package-info.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * This package contains implementations for handling voting data from the Swedish Parliament (Riksdagen). - * - * Key classes: - * - BallotContainer: Represents a container for ballot documents. - * - BallotDocumentData: Represents the data of a ballot document. - * - BallotDocumentElement: Represents an element of a ballot document. - * - VoteData: Represents the data of a vote. - * - VoteDataDto: Represents a data transfer object for vote data. - * - VoteDataEmbeddedId: Represents an embedded ID for vote data. - * - VoteDecision: Enum representing different vote decisions. - * - BallotType: Enum representing different ballot types. - * - SexType: Enum representing different sex types. - * - VoteIssueType: Enum representing different vote issue types. - * - * Dependencies and relationships: - * - Depends on javax.persistence for entity and table annotations. - * - Depends on javax.xml.bind.annotation for XML binding annotations. - * - Depends on org.apache.commons.lang3.builder for utility classes. - * - Depends on com.hack23.cia.model.common.api for the ModelObject interface. - * - Depends on com.hack23.cia.model.external.riksdagen.voteringlista.impl for handling voting list data. - */ -@javax.xml.bind.annotation.XmlSchema(namespace = "http://votering.riksdagen.external.model.cia.hack23.com/impl") -package com.hack23.cia.model.external.riksdagen.votering.impl; diff --git a/model.external.riksdagen.votering.impl/pom.xml b/model.external.riksdagen.votering.impl/pom.xml index 27e08d21be..6661f14c94 100644 --- a/model.external.riksdagen.votering.impl/pom.xml +++ b/model.external.riksdagen.votering.impl/pom.xml @@ -20,7 +20,8 @@ https://github.com/Hack23/cia/tree/master/ - + github scm:git:ssh://git@github.com/Hack23/cia.git/model.external.riksdagen.votering.impl @@ -35,8 +36,8 @@ - - + + diff --git a/model.external.riksdagen.voteringlista.impl/pom.xml b/model.external.riksdagen.voteringlista.impl/pom.xml index 6c56cf1b6d..a7426f9f0e 100644 --- a/model.external.riksdagen.voteringlista.impl/pom.xml +++ b/model.external.riksdagen.voteringlista.impl/pom.xml @@ -35,8 +35,8 @@ - - + + diff --git a/model.external.val.kommunvalkrets.impl/pom.xml b/model.external.val.kommunvalkrets.impl/pom.xml index a48a4da78b..6c4e66d87c 100644 --- a/model.external.val.kommunvalkrets.impl/pom.xml +++ b/model.external.val.kommunvalkrets.impl/pom.xml @@ -35,8 +35,8 @@ - - + + diff --git a/model.external.val.landstingvalkrets.impl/pom.xml b/model.external.val.landstingvalkrets.impl/pom.xml index 717504aa7b..dd9edf9149 100644 --- a/model.external.val.landstingvalkrets.impl/pom.xml +++ b/model.external.val.landstingvalkrets.impl/pom.xml @@ -35,8 +35,8 @@ - - + + diff --git a/model.external.val.partier.impl/pom.xml b/model.external.val.partier.impl/pom.xml index 994323feb5..edef919e31 100644 --- a/model.external.val.partier.impl/pom.xml +++ b/model.external.val.partier.impl/pom.xml @@ -20,7 +20,8 @@ https://github.com/Hack23/cia/tree/master/ - + github scm:git:ssh://git@github.com/Hack23/cia.git/model.external.val.partier.impl @@ -35,9 +36,8 @@ - - - + + diff --git a/model.external.val.riksdagsvalkrets.impl/pom.xml b/model.external.val.riksdagsvalkrets.impl/pom.xml index bd94bca0ea..17d36f07ee 100644 --- a/model.external.val.riksdagsvalkrets.impl/pom.xml +++ b/model.external.val.riksdagsvalkrets.impl/pom.xml @@ -20,7 +20,8 @@ https://github.com/Hack23/cia/tree/master/ - + github scm:git:ssh://git@github.com/Hack23/cia.git/model.external.val.riksdagsvalkrets.impl @@ -35,8 +36,8 @@ - - + + diff --git a/model.external.worldbank.countries.impl/pom.xml b/model.external.worldbank.countries.impl/pom.xml index 04913175e8..83040fa805 100644 --- a/model.external.worldbank.countries.impl/pom.xml +++ b/model.external.worldbank.countries.impl/pom.xml @@ -20,7 +20,8 @@ https://github.com/Hack23/cia/tree/master/ - + github scm:git:ssh://git@github.com/Hack23/cia.git/model.external.worldbank.countries.impl @@ -35,8 +36,8 @@ - - + + diff --git a/model.external.worldbank.data.impl/pom.xml b/model.external.worldbank.data.impl/pom.xml index 2196633ec9..606287fd2a 100644 --- a/model.external.worldbank.data.impl/pom.xml +++ b/model.external.worldbank.data.impl/pom.xml @@ -20,7 +20,8 @@ https://github.com/Hack23/cia/tree/master/ - + github scm:git:ssh://git@github.com/Hack23/cia.git/model.external.worldbank.data.impl @@ -35,8 +36,8 @@ - - + + diff --git a/model.external.worldbank.indicators.impl/pom.xml b/model.external.worldbank.indicators.impl/pom.xml index 89e12a26b2..f586577f11 100644 --- a/model.external.worldbank.indicators.impl/pom.xml +++ b/model.external.worldbank.indicators.impl/pom.xml @@ -35,8 +35,8 @@ - - + + diff --git a/model.external.worldbank.topic.impl/pom.xml b/model.external.worldbank.topic.impl/pom.xml index 2f33e46c3b..420be2c890 100644 --- a/model.external.worldbank.topic.impl/pom.xml +++ b/model.external.worldbank.topic.impl/pom.xml @@ -20,7 +20,8 @@ https://github.com/Hack23/cia/tree/master/ - + github scm:git:ssh://git@github.com/Hack23/cia.git/model.external.worldbank.topic.impl @@ -35,8 +36,8 @@ - - + + diff --git a/model.internal.application.user.impl/pom.xml b/model.internal.application.user.impl/pom.xml index cf78ce8c2a..2676f7f75f 100644 --- a/model.internal.application.user.impl/pom.xml +++ b/model.internal.application.user.impl/pom.xml @@ -20,7 +20,8 @@ https://github.com/Hack23/cia/tree/master/ - + github scm:git:ssh://git@github.com/Hack23/cia.git/model.internal.application.user.impl @@ -231,11 +232,11 @@ ${project.basedir}/src/main/java target/metamodel - true org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor - -source 8 -target ${jdk.target.version} -AaddGeneratedAnnotation=false + -source 8 -target ${jdk.target.version} + -AaddGeneratedAnnotation=false **/module-info.* @@ -248,8 +249,6 @@ - - diff --git a/model.internal.application.user.impl/src/main/java/module-info.java b/model.internal.application.user.impl/src/main/java/module-info.java index e514bd8e6c..8720452c21 100644 --- a/model.internal.application.user.impl/src/main/java/module-info.java +++ b/model.internal.application.user.impl/src/main/java/module-info.java @@ -1,20 +1,26 @@ /** * CIA (Citizen Intelligence Agency) Internal Application User Model Module. * - *

This module defines and implements user-related entities including account, - * authentication, and security contexts within the CIA application.

+ *

+ * This module defines and implements user-related entities including account, + * authentication, and security contexts within the CIA application. + *

* - *

Key Features:

+ *

+ * Key Features: + *

*
    - *
  • User management and authentication entities
    • - *
  • DDD-style domain model design
    • - *
  • Audit and version tracking
    • + *
  • User management and authentication entities
    • + *
  • DDD-style domain model design
    • + *
  • Audit and version tracking
    • *
* - *

Technologies / Integrations:

+ *

+ * Technologies / Integrations: + *

*
    - *
  • JPA/Hibernate for entity persistence
    • - *
  • Slf4j for logging
    • + *
  • JPA/Hibernate for entity persistence
    • + *
  • Slf4j for logging
    • *
*/ open module com.hack23.cia.model.internal.application.user.impl { @@ -24,26 +30,23 @@ exports com.hack23.cia.model.internal.application.data.ministry.impl; exports com.hack23.cia.model.internal.application.secure.impl; exports com.hack23.cia.model.internal.application.data.rules.impl; - exports com.hack23.cia.model.internal.application.data.impl; + exports com.hack23.cia.model.internal.application.data.impl; exports com.hack23.cia.model.internal.application.data.party.impl; exports com.hack23.cia.model.internal.application.data.politician.impl; exports com.hack23.cia.model.internal.application.data.document.impl; exports com.hack23.cia.model.internal.application.data.audit.impl; - - requires com.hack23.model.common.api; + requires com.hack23.model.common.api; requires transitive com.hack23.cia.model.common.impl; - requires java.xml.bind; - requires java.persistence; - requires org.hibernate.orm.jpamodelgen; - requires org.slf4j; - requires org.apache.commons.lang3; - requires jaxb2.basics.runtime; - requires javers.core; - requires com.fasterxml.jackson.core; - requires com.fasterxml.jackson.databind; + requires java.xml.bind; + requires java.persistence; + requires org.hibernate.orm.jpamodelgen; + requires org.slf4j; + requires org.apache.commons.lang3; + requires jaxb2.basics.runtime; + requires javers.core; + requires com.fasterxml.jackson.core; + requires com.fasterxml.jackson.databind; - - } diff --git a/parent-model-internal-pom/pom.xml b/parent-model-internal-pom/pom.xml index e08e7ba164..339c0e2c0e 100644 --- a/parent-model-internal-pom/pom.xml +++ b/parent-model-internal-pom/pom.xml @@ -200,7 +200,6 @@ ${project.basedir}/src/main/java target/metamodel - true org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor diff --git a/parent-model-jpa2-pom/pom.xml b/parent-model-jpa2-pom/pom.xml index 3b4cd8d868..a9c5c170fe 100644 --- a/parent-model-jpa2-pom/pom.xml +++ b/parent-model-jpa2-pom/pom.xml @@ -90,13 +90,6 @@ org.jboss.logging jboss-logging - - - - org.hibernate - hibernate-jpamodelgen - ${cia.project.versions.hibernate} - org.slf4j slf4j-api diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml index cbaa3bbd4a..610b1b4599 100644 --- a/parent-pom/pom.xml +++ b/parent-pom/pom.xml @@ -156,13 +156,26 @@ 21 21 21 - --add-exports java.base/sun.nio.ch=ALL-UNNAMED - --add-exports java.base/jdk.internal.ref=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED + --add-exports java.base/sun.nio.ch=ALL-UNNAMED + --add-exports java.base/jdk.internal.ref=ALL-UNNAMED --add-opens + java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED + --add-opens java.base/java.util=ALL-UNNAMED ${project.build.directory}/${project.artifactId}-${project.version} ${project.build.directory}/site/tattleTaleReport + + org.hibernate + hibernate-jpamodelgen + ${cia.project.versions.hibernate} + + + org.slf4j + slf4j-api + + + javax.validation validation-api @@ -428,6 +441,11 @@ jandex 3.2.3 + + io.smallrye + jandex + 3.2.3 + org.hibernate.validator hibernate-validator @@ -786,7 +804,7 @@ ${scmPublish.checkoutDirectory} Publishing Site Docs for - ${project.artifactId}:${project.version} + ${project.artifactId}:${project.version} ${project.build.directory}/staging true ${scm-publish.pubScmUrl} @@ -1295,7 +1313,7 @@ ${jdk.target.version} true lines,vars,source - true + cd @@ -1414,8 +1432,10 @@ 21 - --add-exports java.base/sun.nio.ch=ALL-UNNAMED - --add-exports java.base/jdk.internal.ref=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED + --add-exports java.base/sun.nio.ch=ALL-UNNAMED + --add-exports java.base/jdk.internal.ref=ALL-UNNAMED --add-opens + java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED + --add-opens java.base/java.util=ALL-UNNAMED 21 21 false diff --git a/parent-service-pom/pom.xml b/parent-service-pom/pom.xml index b7db7fa54c..c0e3ebf847 100644 --- a/parent-service-pom/pom.xml +++ b/parent-service-pom/pom.xml @@ -78,7 +78,6 @@ org.hibernate hibernate-jpamodelgen - ${cia.project.versions.hibernate} org.slf4j @@ -243,11 +242,6 @@ - - org.hibernate - hibernate-jpamodelgen - ${cia.project.versions.hibernate} - diff --git a/parent-web-pom/pom.xml b/parent-web-pom/pom.xml index 7612cb5738..6a93963e6f 100755 --- a/parent-web-pom/pom.xml +++ b/parent-web-pom/pom.xml @@ -42,6 +42,17 @@ + + org.hibernate + hibernate-jpamodelgen + ${cia.project.versions.hibernate} + + + org.slf4j + slf4j-api + + + com.vaadin vaadin-themes diff --git a/service.data.impl/pom.xml b/service.data.impl/pom.xml index bb79fae49a..06e71d9bd3 100644 --- a/service.data.impl/pom.xml +++ b/service.data.impl/pom.xml @@ -892,9 +892,10 @@ 1.7.0 - org.jboss + io.smallrye jandex + org.jboss.logging jboss-logging @@ -1177,12 +1178,12 @@ org.codehaus.mojo hibernate3-maven-plugin - + - - + + diff --git a/service.data.impl/src/main/java/module-info.java b/service.data.impl/src/main/java/module-info.java index 00e381d885..7f4fd65145 100644 --- a/service.data.impl/src/main/java/module-info.java +++ b/service.data.impl/src/main/java/module-info.java @@ -59,14 +59,14 @@ requires org.hibernate.search.engine; requires org.hibernate.search.backend.lucene; - requires transitive org.hibernate.search.mapper.pojo; // Make this transitive - requires transitive org.hibernate.search.mapper.orm; + requires org.hibernate.search.mapper.pojo; + requires org.hibernate.search.mapper.orm; requires com.fasterxml.jackson.databind; - requires transitive aws.secretsmanager.caching.java; - requires transitive aws.secretsmanager.jdbc; - requires transitive aws.java.sdk.secretsmanager; - requires transitive aws.java.sdk.core; + requires aws.secretsmanager.caching.java; + requires aws.secretsmanager.jdbc; + requires aws.java.sdk.secretsmanager; + requires aws.java.sdk.core; requires software.amazon.awssdk.core; requires software.amazon.awssdk.services.secretsmanager; @@ -74,10 +74,10 @@ requires org.apache.commons.lang3; requires lucene.analyzers.common; - requires transitive javers.spring; - requires transitive javers.spring.jpa; - requires transitive javers.persistence.sql; - requires transitive javers.core; + requires javers.spring; + requires javers.spring.jpa; + requires javers.persistence.sql; + requires javers.core; requires com.google.common; diff --git a/service.external.common/src/main/java/module-info.java b/service.external.common/src/main/java/module-info.java index 68845b2aa9..f7f7c1453a 100644 --- a/service.external.common/src/main/java/module-info.java +++ b/service.external.common/src/main/java/module-info.java @@ -47,17 +47,17 @@ * */ open module com.hack23.cia.service.external.common { - exports com.hack23.cia.service.external.common.api; - exports com.hack23.cia.service.external.common.impl; - - requires org.slf4j; - requires java.xml.bind; - requires jakarta.activation; - requires org.jdom2; - requires transitive spring.oxm; - requires transitive spring.beans; - requires transitive spring.core; - requires transitive spring.context; - requires transitive org.apache.httpcomponents.httpclient; - requires transitive org.apache.httpcomponents.httpclient.fluent; + exports com.hack23.cia.service.external.common.api; + exports com.hack23.cia.service.external.common.impl; + + requires org.slf4j; + requires java.xml.bind; + requires jakarta.activation; + requires org.jdom2; + requires transitive spring.oxm; + requires transitive spring.beans; + requires transitive spring.core; + requires transitive spring.context; + requires org.apache.httpcomponents.httpclient; + requires org.apache.httpcomponents.httpclient.fluent; } diff --git a/service.external.riksdagen/src/main/java/module-info.java b/service.external.riksdagen/src/main/java/module-info.java index f660aa7611..d068a02717 100644 --- a/service.external.riksdagen/src/main/java/module-info.java +++ b/service.external.riksdagen/src/main/java/module-info.java @@ -59,7 +59,7 @@ requires org.slf4j; requires transitive spring.context; requires transitive spring.beans; - requires transitive spring.aop; + requires spring.aop; requires jakarta.activation; requires transitive com.hack23.cia.service.external.common; diff --git a/service.external.worldbank/src/main/java/module-info.java b/service.external.worldbank/src/main/java/module-info.java index f92a71fa69..19d222e495 100644 --- a/service.external.worldbank/src/main/java/module-info.java +++ b/service.external.worldbank/src/main/java/module-info.java @@ -1,62 +1,77 @@ /** * CIA (Citizen Intelligence Agency) World Bank Service Module. * - *

This module provides integration with the World Bank's data services, - * enabling access to global economic indicators, country data, and development metrics. - * It serves as a crucial component for international financial and economic analysis.

+ *

+ * This module provides integration with the World Bank's data services, + * enabling access to global economic indicators, country data, and development + * metrics. + * It serves as a crucial component for international financial and economic + * analysis. + *

* - *

The module exports two packages:

+ *

+ * The module exports two packages: + *

*
    - *
  • {@code com.hack23.cia.service.external.worldbank.api} - Public interfaces for World Bank data access
    • - *
  • {@code com.hack23.cia.service.external.worldbank.impl} - Implementation of World Bank service interfaces
    • + *
  • {@code com.hack23.cia.service.external.worldbank.api} - Public interfaces + * for World Bank data access
    • + *
  • {@code com.hack23.cia.service.external.worldbank.impl} - Implementation + * of World Bank service interfaces
    • *
* - *

Data Categories:

+ *

+ * Data Categories: + *

*
    - *
  • Economic Indicators - *
      - *
    • Development metrics
      • - *
    • Financial indicators
      • - *
    • Economic trends
      • - *
    - *
    • - *
  • Country Information - *
      - *
    • Country profiles
      • - *
    • Regional data
      • - *
    • Development status
      • - *
    - *
    • - *
  • Topic Analysis - *
      - *
    • Development topics
      • - *
    • Global challenges
      • - *
    • Economic sectors
      • - *
    - *
    • + *
  • Economic Indicators + *
      + *
    • Development metrics
      • + *
    • Financial indicators
      • + *
    • Economic trends
      • + *
    + *
    • + *
  • Country Information + *
      + *
    • Country profiles
      • + *
    • Regional data
      • + *
    • Development status
      • + *
    + *
    • + *
  • Topic Analysis + *
      + *
    • Development topics
      • + *
    • Global challenges
      • + *
    • Economic sectors
      • + *
    + *
    • *
* - *

Key Features:

+ *

+ * Key Features: + *

*
    - *
  • Data Processing - *
      - *
    • XML and CSV data handling
      • - *
    • Indicator processing
      • - *
    • Time series analysis
      • - *
    - *
    • - *
  • Integration - *
      - *
    • World Bank API connectivity
      • - *
    • Data synchronization
      • - *
    • Error handling and logging
      • - *
    - *
    • + *
  • Data Processing + *
      + *
    • XML and CSV data handling
      • + *
    • Indicator processing
      • + *
    • Time series analysis
      • + *
    + *
    • + *
  • Integration + *
      + *
    • World Bank API connectivity
      • + *
    • Data synchronization
      • + *
    • Error handling and logging
      • + *
    + *
    • *
* - *

This module integrates with the common external service framework and provides + *

+ * This module integrates with the common external service framework and + * provides * standardized access to World Bank data as part of the CIA's comprehensive - * financial and economic monitoring system.

+ * financial and economic monitoring system. + *

* * @see com.hack23.cia.service.external.common * @see com.hack23.cia.model.external.worldbank @@ -64,19 +79,18 @@ open module com.hack23.cia.service.external.worldbank { exports com.hack23.cia.service.external.worldbank.api; exports com.hack23.cia.service.external.worldbank.impl; - + + requires org.slf4j; requires java.xml.bind; + requires spring.context; requires spring.beans; - requires org.slf4j; - requires org.apache.commons.codec; + requires jakarta.activation; + requires org.apache.commons.lang3; requires org.apache.commons.csv; - requires transitive com.hack23.cia.service.external.common; - - requires transitive com.hack23.cia.model.external.worldbank.topic.impl; - requires transitive com.hack23.cia.model.external.worldbank.indicators.impl; - requires transitive com.hack23.cia.model.external.worldbank.data.impl; requires transitive com.hack23.cia.model.external.worldbank.countries.impl; - + requires transitive com.hack23.cia.model.external.worldbank.data.impl; + requires transitive com.hack23.cia.model.external.worldbank.indicators.impl; + requires transitive com.hack23.cia.model.external.worldbank.topic.impl; } \ No newline at end of file diff --git a/service.impl/src/main/java/module-info.java b/service.impl/src/main/java/module-info.java index 288f4dc9a8..ee31236757 100644 --- a/service.impl/src/main/java/module-info.java +++ b/service.impl/src/main/java/module-info.java @@ -61,27 +61,27 @@ requires transitive com.hack23.cia.service.api; requires transitive com.hack23.cia.service.component.agent.api; - requires transitive com.hack23.cia.service.component.agent.impl; + requires com.hack23.cia.service.component.agent.impl; - requires transitive com.hack23.cia.service.external.common; - requires transitive com.hack23.cia.service.data.api; - requires transitive com.hack23.cia.service.external.riksdagen; - requires transitive com.hack23.cia.service.external.val; - requires transitive com.hack23.cia.service.external.worldbank; + requires com.hack23.cia.service.external.common; + requires com.hack23.cia.service.data.api; + requires com.hack23.cia.service.external.riksdagen; + requires com.hack23.cia.service.external.val; + requires com.hack23.cia.service.external.worldbank; - requires transitive com.hack23.cia.model.external.val.riksdagsvalkrets.impl; - requires transitive com.hack23.cia.model.external.riksdagen.voteringlista.impl; - requires transitive com.hack23.cia.model.external.val.kommunvalkrets.impl; - requires transitive com.hack23.cia.model.external.worldbank.topic.impl; - requires transitive com.hack23.cia.model.external.worldbank.indicators.impl; - requires transitive com.hack23.cia.model.external.riksdagen.documentcontent.impl; - requires transitive com.hack23.cia.model.external.worldbank.data.impl; - requires transitive com.hack23.cia.model.external.riksdagen.person.impl; - requires transitive com.hack23.cia.model.external.riksdagen.dokumentstatus.impl; - requires transitive com.hack23.cia.model.external.riksdagen.dokumentlista.impl; - requires transitive com.hack23.cia.model.external.riksdagen.utskottsforslag.impl; - requires transitive com.hack23.cia.model.external.val.partier.impl; - requires transitive com.hack23.cia.model.external.riksdagen.personlista.impl; - requires transitive com.hack23.cia.model.external.val.landstingvalkrets.impl; - requires transitive com.hack23.cia.model.external.riksdagen.votering.impl; + requires com.hack23.cia.model.external.val.riksdagsvalkrets.impl; + requires com.hack23.cia.model.external.riksdagen.voteringlista.impl; + requires com.hack23.cia.model.external.val.kommunvalkrets.impl; + requires com.hack23.cia.model.external.worldbank.topic.impl; + requires com.hack23.cia.model.external.worldbank.indicators.impl; + requires com.hack23.cia.model.external.riksdagen.documentcontent.impl; + requires com.hack23.cia.model.external.worldbank.data.impl; + requires com.hack23.cia.model.external.riksdagen.person.impl; + requires com.hack23.cia.model.external.riksdagen.dokumentstatus.impl; + requires com.hack23.cia.model.external.riksdagen.dokumentlista.impl; + requires com.hack23.cia.model.external.riksdagen.utskottsforslag.impl; + requires com.hack23.cia.model.external.val.partier.impl; + requires com.hack23.cia.model.external.riksdagen.personlista.impl; + requires com.hack23.cia.model.external.val.landstingvalkrets.impl; + requires com.hack23.cia.model.external.riksdagen.votering.impl; } diff --git a/testfoundation/pom.xml b/testfoundation/pom.xml index 117ea1e991..64fd551d44 100644 --- a/testfoundation/pom.xml +++ b/testfoundation/pom.xml @@ -159,7 +159,7 @@ - org.jboss + io.smallrye jandex