diff --git a/citizen-intelligence-agency/build.xml b/citizen-intelligence-agency/build.xml index 04f8789a06..6b224973d1 100644 --- a/citizen-intelligence-agency/build.xml +++ b/citizen-intelligence-agency/build.xml @@ -16,34 +16,34 @@ + line="-B --file pom.xml clean install -pl '!cia-dist-deb,!cia-dist-cloudformation' -Prelease-site -DforkMode=once '-Dtest=!**ITest*,!**DocumentationTest*' -Dmaven.test.failure.ignore=true -DfailIfNoTests=false -Dsurefire.failIfNoSpecifiedTests=false -Dsurefire.reportNameSuffix=UNIT -Dspdx.skip=true" /> + line="versions:display-dependency-updates -Prelease-site,release-sign-artifacts -U" /> + line="versions:display-plugin-updates -Prelease-site,release-sign-artifacts -U " /> + line="clean install -pl '!cia-dist-deb,!cia-dist-cloudformation' -Dmaven.test.failure.ignore=true -Dspdx.skip=true" /> + line="clean install -pl '!cia-dist-deb,!cia-dist-cloudformation' -DskipTests -DfailIfNoTests=false -Dsurefire.failIfNoSpecifiedTests=false -Dspdx.skip=true" /> @@ -60,7 +60,7 @@ + line="clean install site -Prelease-site -Dmaven.test.failure.ignore=true -DforkMode=once -Dannotation.failOnError=false -Dspdx.skip=true" /> \ No newline at end of file diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/CitizenIntelligenceAgencyUI.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/CitizenIntelligenceAgencyUI.java index d131d5dc6f..5037d1a858 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/CitizenIntelligenceAgencyUI.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/CitizenIntelligenceAgencyUI.java @@ -75,6 +75,7 @@ public final class CitizenIntelligenceAgencyUI extends UI { @Autowired private transient ApplicationManager applicationManager; + /** The configuration manager. */ @Autowired private transient ConfigurationManager configurationManager; diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/AdminViewConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/AdminViewConstants.java index 9425ae87aa..1a831db400 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/AdminViewConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/AdminViewConstants.java @@ -125,6 +125,8 @@ public final class AdminViewConstants { /** The Constant ADMIN_AGENCY_MANAGEMENT. */ public static final String ADMIN_AGENCY_MANAGEMENT = "Controls for agency-level data and settings."; + public static final String AGENCY_OVERVIEW_HEADER = "Agency Overview"; + /** The Constant AGENCY_OVERVIEW. */ public static final String AGENCY_OVERVIEW = "High-level review of agencies and their attributes."; @@ -134,6 +136,8 @@ public final class AdminViewConstants { /** The Constant ADMIN_APPLICATION_EVENT_CHARTS. */ public static final String ADMIN_APPLICATION_EVENT_CHARTS = "Visual analytics of application events for trend analysis."; + public static final String EVENT_ANALYSIS_HEADER = "Event Analysis"; + /** The Constant EVENT_ANALYSIS. */ public static final String EVENT_ANALYSIS = "Advanced examination of event data and metrics."; @@ -254,11 +258,11 @@ public final class AdminViewConstants { /** The Constant ADMIN_AGENT_OPERATION_DEPLOY_WORLD_BUTTON. */ public static final String ADMIN_AGENT_OPERATION_DEPLOY_WORLD_BUTTON = "Initiates agent deployment worldwide."; + /** The Constant ADMIN_AGENT_OPERATION_DEPLOY_DESC. */ public static final String ADMIN_AGENT_OPERATION_DEPLOY_DESC = "Starts OSINT gathering for the specified region."; - public static final String MONITORING_ACCESS_DENIED = null; - - public static final String ACCESS_DENIED = null; + /** The Constant ACCESS_DENIED. */ + public static final String ACCESS_DENIED = "Access denied:"; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/datasummary/pagemode/DataSummaryAuthorPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/datasummary/pagemode/DataSummaryAuthorPageModContentFactoryImpl.java index 0a01f492cd..046521ffd8 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/datasummary/pagemode/DataSummaryAuthorPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/datasummary/pagemode/DataSummaryAuthorPageModContentFactoryImpl.java @@ -40,8 +40,10 @@ @Component public final class DataSummaryAuthorPageModContentFactoryImpl extends AbstractDataSummaryPageModContentFactoryImpl { + /** The Constant COLUMN_ORDER. */ private static final String[] COLUMN_ORDER = { "author", "changes", "firstDate", "lastDate" }; + /** The Constant HIDE_COLUMNS. */ private static final String[] HIDE_COLUMNS = { "id" }; /** The Constant NAME. */ diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/datasummary/pagemode/DataSummaryOverviewPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/datasummary/pagemode/DataSummaryOverviewPageModContentFactoryImpl.java index faddf2a3b5..d72de6e139 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/datasummary/pagemode/DataSummaryOverviewPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/datasummary/pagemode/DataSummaryOverviewPageModContentFactoryImpl.java @@ -55,8 +55,10 @@ public final class DataSummaryOverviewPageModContentFactoryImpl extends Abstract /** The Constant ADMIN_DATA_SUMMARY. */ private static final String ADMIN_DATA_SUMMARY = "Admin Data Summary"; + /** The Constant COLUMN_ORDER. */ private static final String[] COLUMN_ORDER = { "dataType", "dataSize" }; + /** The Constant HIDE_COLUMNS. */ private static final String[] HIDE_COLUMNS = { "id" }; /** The Constant NAME. */ diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/system/pagemode/AbstractAdminSystemPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/system/pagemode/AbstractAdminSystemPageModContentFactoryImpl.java index 921d3b1f4b..577b4fa39e 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/system/pagemode/AbstractAdminSystemPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/system/pagemode/AbstractAdminSystemPageModContentFactoryImpl.java @@ -30,9 +30,11 @@ */ public abstract class AbstractAdminSystemPageModContentFactoryImpl extends AbstractBasicPageModContentFactoryImpl { + /** The paging util. */ @Autowired private PagingUtil pagingUtil; + /** The view name. */ private final String viewName; /** diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/system/pagemode/AdminApplicationConfigurationPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/system/pagemode/AdminApplicationConfigurationPageModContentFactoryImpl.java index 60e50a5231..e655ba22a0 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/system/pagemode/AdminApplicationConfigurationPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/system/pagemode/AdminApplicationConfigurationPageModContentFactoryImpl.java @@ -54,20 +54,25 @@ public final class AdminApplicationConfigurationPageModContentFactoryImpl extends AbstractAdminSystemPageModContentFactoryImpl { + /** The Constant APPLICATION_CONFIGURATION. */ private static final String APPLICATION_CONFIGURATION = "ApplicationConfiguration"; + /** The Constant AS_LIST2. */ private static final List AS_LIST2 = Arrays.asList("configTitle", "configDescription", "componentTitle", "componentDescription", "propertyValue"); + /** The Constant COLUMN_ORDER. */ private static final String[] COLUMN_ORDER = { "hjid", "configurationGroup", "component", "componentTitle", "configTitle", "configDescription", "componentDescription", "propertyId", "propertyValue" }; + /** The Constant HIDE_COLUMNS. */ private static final String[] HIDE_COLUMNS = { "hjid", "modelObjectId", "modelObjectVersion", "createdDate", "updatedDate", "propertyId", "componentDescription", "componentTitle" }; /** The Constant NAME. */ public static final String NAME = AdminViews.ADMIN_APPLICATIONS_CONFIGURATION_VIEW_NAME; + /** The Constant UPDATE_CONFIGURATION. */ private static final String UPDATE_CONFIGURATION = "Update Configuration"; /** diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/system/pagemode/AdminApplicationEventsChartsPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/system/pagemode/AdminApplicationEventsChartsPageModContentFactoryImpl.java index 192406105f..b6254546a7 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/system/pagemode/AdminApplicationEventsChartsPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/system/pagemode/AdminApplicationEventsChartsPageModContentFactoryImpl.java @@ -59,7 +59,7 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina getMenuItemFactory().createMainPageMenuBar(menuBar); - CardInfoRowUtil.createPageHeader(panel, content, AdminViewConstants.ADMIN_APPLICATION_EVENT_CHARTS, "Event Analysis", AdminViewConstants.EVENT_ANALYSIS); + CardInfoRowUtil.createPageHeader(panel, content, AdminViewConstants.ADMIN_APPLICATION_EVENT_CHARTS, AdminViewConstants.EVENT_ANALYSIS_HEADER, AdminViewConstants.EVENT_ANALYSIS); getAdminChartDataManager().createApplicationActionEventPageDailySummaryChart(content); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/system/pagemode/AdminApplicationEventsPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/system/pagemode/AdminApplicationEventsPageModContentFactoryImpl.java index 57725fb57a..ba8fac48ef 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/system/pagemode/AdminApplicationEventsPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/system/pagemode/AdminApplicationEventsPageModContentFactoryImpl.java @@ -40,17 +40,24 @@ import com.vaadin.ui.Panel; import com.vaadin.ui.VerticalLayout; +/** + * The Class AdminApplicationEventsPageModContentFactoryImpl. + */ @Component public final class AdminApplicationEventsPageModContentFactoryImpl extends AbstractAdminSystemPageModContentFactoryImpl { + /** The Constant APPLICATION_ACTION_EVENT. */ private static final String APPLICATION_ACTION_EVENT = "ApplicationActionEvent"; + /** The Constant COLUMN_ORDER. */ private static final String[] COLUMN_ORDER = { "hjid", "createdDate", "userId", "actionName", "errorMessage", "applicationMessage", "page", "pageMode", "elementId", "modelObjectVersion" }; + /** The Constant HIDE_COLUMNS. */ private static final String[] HIDE_COLUMNS = { "hjid", "modelObjectId", "modelObjectVersion", "sessionId", "eventGroup", "applicationOperation" }; + /** The Constant LISTENER. */ private static final PageItemPropertyClickListener LISTENER = new PageItemPropertyClickListener( AdminViews.ADMIN_APPLICATIONS_EVENTS_VIEW_NAME, "hjid"); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/system/pagemode/AdminApplicationSessionPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/system/pagemode/AdminApplicationSessionPageModContentFactoryImpl.java index e484bfe976..e185998661 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/system/pagemode/AdminApplicationSessionPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/system/pagemode/AdminApplicationSessionPageModContentFactoryImpl.java @@ -51,9 +51,13 @@ @Component public final class AdminApplicationSessionPageModContentFactoryImpl extends AbstractAdminSystemPageModContentFactoryImpl { + /** The Constant APPLICATION_ACTION_EVENT. */ private static final String APPLICATION_ACTION_EVENT = "ApplicationActionEvent"; + + /** The Constant APPLICATION_SESSION. */ private static final String APPLICATION_SESSION = "ApplicationSession"; + /** The Constant COLUMN_ORDER. */ private static final String[] COLUMN_ORDER = { "hjid", "createdDate", @@ -67,6 +71,7 @@ public final class AdminApplicationSessionPageModContentFactoryImpl extends Abst "sessionId" }; + /** The Constant COLUMN_ORDER2. */ private static final String[] COLUMN_ORDER2 = { "hjid", "createdDate", @@ -81,6 +86,7 @@ public final class AdminApplicationSessionPageModContentFactoryImpl extends Abst "modelObjectVersion" }; + /** The Constant HIDE_COLUMNS. */ private static final String[] HIDE_COLUMNS = { "hjid", "modelObjectId", @@ -90,6 +96,7 @@ public final class AdminApplicationSessionPageModContentFactoryImpl extends Abst "ipInformation" }; + /** The Constant HIDE_COLUMNS2. */ private static final String[] HIDE_COLUMNS2 = { "hjid", "modelObjectId", diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/system/pagemode/AdminCountryPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/system/pagemode/AdminCountryPageModContentFactoryImpl.java index e865ea9521..b9a93035cf 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/system/pagemode/AdminCountryPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/system/pagemode/AdminCountryPageModContentFactoryImpl.java @@ -45,6 +45,7 @@ @Component public final class AdminCountryPageModContentFactoryImpl extends AbstractAdminSystemPageModContentFactoryImpl { + /** The Constant COLUMN_ORDER. */ private static final String[] COLUMN_ORDER = { "hjid", "id", @@ -55,8 +56,10 @@ public final class AdminCountryPageModContentFactoryImpl extends AbstractAdminSy "latitude" }; + /** The Constant COUNTRY2. */ private static final String COUNTRY2 = "Country"; + /** The Constant HIDE_COLUMNS. */ private static final String[] HIDE_COLUMNS = { "hjid", "id", @@ -68,6 +71,7 @@ public final class AdminCountryPageModContentFactoryImpl extends AbstractAdminSy "latitude" }; + /** The Constant LISTENER. */ private static final PageItemPropertyClickListener LISTENER = new PageItemPropertyClickListener(AdminViews.ADMIN_COUNTRY_VIEW_NAME, "hjid"); /** The Constant NAME. */ diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/system/pagemode/AdminLanguagePageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/system/pagemode/AdminLanguagePageModContentFactoryImpl.java index 23f97d0e52..d372ab6ddd 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/system/pagemode/AdminLanguagePageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/system/pagemode/AdminLanguagePageModContentFactoryImpl.java @@ -47,12 +47,14 @@ @Component public final class AdminLanguagePageModContentFactoryImpl extends AbstractAdminSystemPageModContentFactoryImpl { + /** The Constant COLUMN_ORDER. */ private static final String[] COLUMN_ORDER = { "hjid", "languageName", "modelObjectVersion" }; + /** The Constant HIDE_COLUMNS. */ private static final String[] HIDE_COLUMNS = { "hjid", "modelObjectId", @@ -61,8 +63,10 @@ public final class AdminLanguagePageModContentFactoryImpl extends AbstractAdminS "lastModifiedDate" }; + /** The Constant LANGUAGE_DATA. */ private static final String LANGUAGE_DATA = "LanguageData"; + /** The Constant LISTENER. */ private static final PageItemPropertyClickListener LISTENER = new PageItemPropertyClickListener(AdminViews.ADMIN_LANGUAGE_VIEW_NAME, "hjid"); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/system/pagemode/AdminPortalPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/system/pagemode/AdminPortalPageModContentFactoryImpl.java index 52cba8db99..7402ce5719 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/system/pagemode/AdminPortalPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/system/pagemode/AdminPortalPageModContentFactoryImpl.java @@ -45,6 +45,7 @@ @Component public final class AdminPortalPageModContentFactoryImpl extends AbstractAdminSystemPageModContentFactoryImpl { + /** The Constant COLUMN_ORDER. */ private static final String[] COLUMN_ORDER = { "hjid", "portalName", @@ -54,6 +55,7 @@ public final class AdminPortalPageModContentFactoryImpl extends AbstractAdminSys "modelObjectVersion" }; + /** The Constant HIDE_COLUMNS. */ private static final String[] HIDE_COLUMNS = { "hjid", "modelObjectId", @@ -64,6 +66,7 @@ public final class AdminPortalPageModContentFactoryImpl extends AbstractAdminSys /** The Constant NAME. */ public static final String NAME = AdminViews.ADMIN_PORTAL_VIEW_NAME; + /** The Constant PORTAL2. */ private static final String PORTAL2 = "Portal"; /** diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/system/pagemode/AdminUserAccountPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/system/pagemode/AdminUserAccountPageModContentFactoryImpl.java index 065b830a21..24090da9b4 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/system/pagemode/AdminUserAccountPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/admin/system/pagemode/AdminUserAccountPageModContentFactoryImpl.java @@ -48,6 +48,9 @@ import com.vaadin.ui.Panel; import com.vaadin.ui.VerticalLayout; +/** + * The Class AdminUserAccountPageModContentFactoryImpl. + */ @Component public final class AdminUserAccountPageModContentFactoryImpl extends AbstractAdminSystemPageModContentFactoryImpl { @@ -58,18 +61,22 @@ public final class AdminUserAccountPageModContentFactoryImpl extends AbstractAdm /** The Constant BUTTON_PATTERN. */ private static final String BUTTON_PATTERN = "Perform {0}"; + /** The Constant COLUMN_ORDER. */ private static final String[] COLUMN_ORDER = { "hjid", "modelObjectId", "modelObjectVersion", "createdDate", "userId", "username", "userType", "userRole", "userpassword", "email", "country", "numberOfVisits" }; + /** The Constant HIDE_COLUMNS. */ private static final String[] HIDE_COLUMNS = { "hjid", "modelObjectId", "modelObjectVersion", "userId", "userpassword", "address" }; + /** The Constant LISTENER. */ private static final PageItemPropertyClickListener LISTENER = new PageItemPropertyClickListener( AdminViews.ADMIN_USERACCOUNT_VIEW_NAME, "hjid"); /** The Constant NAME. */ public static final String NAME = AdminViews.ADMIN_USERACCOUNT_VIEW_NAME; + /** The Constant USER_ACCOUNT. */ private static final String USER_ACCOUNT = "UserAccount"; /** diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/chartfactory/impl/AbstractGhantChartManagerImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/chartfactory/impl/AbstractGhantChartManagerImpl.java index f01d917d40..3c15b462c1 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/chartfactory/impl/AbstractGhantChartManagerImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/chartfactory/impl/AbstractGhantChartManagerImpl.java @@ -346,7 +346,7 @@ public interface StepMapping { /** * Gets the to date. * - * @param t + * @param t the t * @return the to date */ Date getToDate(T t); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/chartfactory/impl/ChartUtils.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/chartfactory/impl/ChartUtils.java index d6424b38c5..6a0f540804 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/chartfactory/impl/ChartUtils.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/chartfactory/impl/ChartUtils.java @@ -25,7 +25,7 @@ public final class ChartUtils { /** The Constant CHART_LEFT_MARGIN. */ private static final int CHART_LEFT_MARGIN = 2; - /** The Constant CHART_RIGHT_MARGIN = 2; */ + /** The Constant CHART_RIGHT_MARGIN = 2;. */ private static final int CHART_RIGHT_MARGIN = 2; /** The Constant CHART_TOP_MARGIN_SIZE. */ diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/chartfactory/impl/GovernmentBodyChartDataManagerImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/chartfactory/impl/GovernmentBodyChartDataManagerImpl.java index 8fafaabd5c..659a41ed0b 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/chartfactory/impl/GovernmentBodyChartDataManagerImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/chartfactory/impl/GovernmentBodyChartDataManagerImpl.java @@ -41,30 +41,59 @@ import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.VerticalLayout; +/** + * The Class GovernmentBodyChartDataManagerImpl. + */ @Service public final class GovernmentBodyChartDataManagerImpl extends AbstractChartDataManagerImpl implements GovernmentBodyChartDataManager { + /** The Constant ALL_GOVERNMENT_BODIES. */ private static final String ALL_GOVERNMENT_BODIES = "All government bodies"; + + /** The Constant ANNUAL_EXPENDITURE. */ private static final String ANNUAL_EXPENDITURE = "Annual Expenditure"; + + /** The Constant ANNUAL_HEADCOUNT. */ private static final String ANNUAL_HEADCOUNT = "Annual headcount"; + + /** The Constant ANNUAL_HEADCOUNT_ALL_MINISTRIES. */ private static final String ANNUAL_HEADCOUNT_ALL_MINISTRIES = "Annual headcount, all ministries"; + + /** The Constant ANNUAL_HEADCOUNT_SUMMARY_ALL_GOVERNMENT_BODIES. */ private static final String ANNUAL_HEADCOUNT_SUMMARY_ALL_GOVERNMENT_BODIES = "Annual headcount summary, all government bodies"; + + /** The Constant ANNUAL_HEADCOUNT_TOTAL_ALL_GOVERNMENT_BODIES. */ private static final String ANNUAL_HEADCOUNT_TOTAL_ALL_GOVERNMENT_BODIES = "Annual headcount total all government bodies"; + + /** The Constant ANNUAL_INCOME. */ private static final String ANNUAL_INCOME = "Annual Income"; + + /** The Constant EXPENDITURE_GROUP_NAME. */ private static final String EXPENDITURE_GROUP_NAME = "Utgiftsområdesnamn"; + + /** The Constant INKOMSTTITELGRUPPSNAMN. */ private static final String INKOMSTTITELGRUPPSNAMN = "Inkomsttitelgruppsnamn"; + + /** The Constant INKOMSTTITELSNAMN. */ private static final String INKOMSTTITELSNAMN = "Inkomsttitelsnamn"; + + /** The Constant ANSLAGSPOSTSNAMN. */ private static final String ANSLAGSPOSTSNAMN = "Anslagspostsnamn"; + /** The esv api. */ @Autowired private EsvApi esvApi; /** * Adds a data point to the DataSeries if the year and value are valid and value > 0. + * + * @param dataSeries the data series + * @param year the year + * @param value the value */ private static void addDataPoint(DataSeries dataSeries, Integer year, Number value) { if (dataSeries == null || year == null || value == null) { @@ -77,8 +106,14 @@ private static void addDataPoint(DataSeries dataSeries, Integer year, Number val dataSeries.add(formattedDate, doubleValue); } } + /** * Creates a chart using the provided data/series objects, then appends it to the given layout. + * + * @param layout the layout + * @param label the label + * @param dataSeries the data series + * @param series the series */ private void addChartToLayout(AbstractOrderedLayout layout, String label, DataSeries dataSeries, Series series) { @@ -96,6 +131,10 @@ private void addChartToLayout(AbstractOrderedLayout layout, String label, /** * Consolidates logic to retrieve, group, and process data by a descriptive field * (e.g., 'Utgiftsområdesnamn' or 'Inkomsttitelgruppsnamn'), feeding the results into a DataSeries. + * + * @param dataSeries the data series + * @param series the series + * @param groupedData the grouped data */ private void buildAnnualOutcomeDataSeriesByField(DataSeries dataSeries, Series series, Map> groupedData) { @@ -131,6 +170,11 @@ private void buildAnnualOutcomeDataSeriesByField(DataSeries dataSeries, Series s /** * Helper method to generate a headcount data series given a map of year -> list of summaries. + * + * @param dataSeries the data series + * @param series the series + * @param yearlyData the yearly data + * @param label the label */ private void buildHeadcountDataSeries(DataSeries dataSeries, Series series, Map> yearlyData, @@ -154,6 +198,10 @@ private void buildHeadcountDataSeries(DataSeries dataSeries, Series series, /** * Consolidates logic for creating a chart that is grouped by some string field in descriptionFields. + * + * @param layout the layout + * @param field the field + * @param chartLabel the chart label */ private void createMinistryFieldSummary(AbstractOrderedLayout layout, String field, String chartLabel) { Objects.requireNonNull(layout, "Layout cannot be null"); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/formfactory/impl/FormFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/formfactory/impl/FormFactoryImpl.java index fe4977fa08..1baaa071a2 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/formfactory/impl/FormFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/formfactory/impl/FormFactoryImpl.java @@ -77,6 +77,7 @@ public final class FormFactoryImpl implements FormFactory { /** The Constant SIZE_FOR_GRID. */ private static final int SIZE_FOR_GRID = 8; + /** The Constant TYPE_CONVERTERS. */ private static final Map, Converter> TYPE_CONVERTERS = new HashMap<>(); static { diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/formfactory/impl/StringToEnumConverter.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/formfactory/impl/StringToEnumConverter.java index fd31bd4689..91c93505d8 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/formfactory/impl/StringToEnumConverter.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/formfactory/impl/StringToEnumConverter.java @@ -24,6 +24,8 @@ /** * The Class StringToEnumConverter. + * + * @param the element type */ final class StringToEnumConverter> implements Converter { diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/gridfactory/impl/GridFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/gridfactory/impl/GridFactoryImpl.java index 54fcfab62a..758dd209a8 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/gridfactory/impl/GridFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/gridfactory/impl/GridFactoryImpl.java @@ -123,6 +123,13 @@ private static void createGridCellFilter(final String[] columnOrder, final Grid } } + /** + * Creates the nested properties. + * + * @param the generic type + * @param grid the grid + * @param nestedProperties the nested properties + */ private static void createNestedProperties(final Grid grid, final String[] nestedProperties) { if (nestedProperties != null) { 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 8c6b4ef239..75b5f08b49 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 @@ -53,29 +53,71 @@ public final class PoliticianMenuItemFactoryImpl extends AbstractMenuItemFactory /** Menu labels. */ private static final String BALLOT_DECISION_SUMMARY_TEXT = "Ballot Decision Summary"; + + /** The Constant BALLOTS_TEXT. */ private static final String BALLOTS_TEXT = "Ballots"; + + /** 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 INDICATORS_TEXT. */ private static final String INDICATORS_TEXT = "Indicators"; + + /** 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 POLITICIAN_RANKING. */ private static final String POLITICIAN_RANKING = "Politician Ranking"; + + /** The Constant ROLE_GHANT_TEXT. */ private static final String ROLE_GHANT_TEXT = "Role Gantt"; + + /** The Constant ROLE_LIST. */ private static final String ROLE_LIST = "Role List"; + + /** The Constant ROLES_TEXT. */ private static final String ROLES_TEXT = "Roles"; + + /** The Constant TOTAL_EXPERIENCE. */ private static final String TOTAL_EXPERIENCE = "Total Experience"; + + /** The Constant VOTE_HISTORY. */ private static final String VOTE_HISTORY = "Vote History"; /** Descriptions (~50 characters). */ private static final String INDICATORS_DESCRIPTION = "Key performance indicators."; + + /** The Constant TOTAL_EXPERIENCE_DESCRIPTION. */ private static final String TOTAL_EXPERIENCE_DESCRIPTION = "Summary of political experience."; + + /** The Constant ROLE_LIST_DESCRIPTION. */ private static final String ROLE_LIST_DESCRIPTION = "Detailed list of roles."; + + /** The Constant ROLE_GHANT_DESCRIPTION. */ private static final String ROLE_GHANT_DESCRIPTION = "Gantt chart of roles."; + + /** The Constant DOCUMENT_ACTIVITY_DESCRIPTION. */ private static final String DOCUMENT_ACTIVITY_DESCRIPTION = "Activity by document type."; + + /** The Constant DOCUMENT_HISTORY_DESCRIPTION. */ private static final String DOCUMENT_HISTORY_DESCRIPTION = "History of document access."; + + /** The Constant VOTE_HISTORY_DESCRIPTION. */ private static final String VOTE_HISTORY_DESCRIPTION = "Summary of voting records."; + + /** The Constant BALLOT_DECISION_SUMMARY_DESCRIPTION. */ private static final String BALLOT_DECISION_SUMMARY_DESCRIPTION = "Overview of ballot decisions."; + + /** The Constant PAGE_VISIT_HISTORY_DESCRIPTION. */ private static final String PAGE_VISIT_HISTORY_DESCRIPTION = "History of page visits."; /** The application menu item factory. */ diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/PoliticianRankingMenuItemFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/PoliticianRankingMenuItemFactoryImpl.java index 4fde20f498..cea68af34a 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/PoliticianRankingMenuItemFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/impl/PoliticianRankingMenuItemFactoryImpl.java @@ -49,34 +49,64 @@ public final class PoliticianRankingMenuItemFactoryImpl extends AbstractMenuItemFactoryImpl implements PoliticianRankingMenuItemFactory { + /** The Constant ALL_PARTIES. */ // Label constants private static final String ALL_PARTIES = "All parties"; + + /** The Constant CHART_BY_TOPIC_TEXT. */ private static final String CHART_BY_TOPIC_TEXT = "Chart by topic"; + + /** The Constant CURRENT_PARTIES. */ private static final String CURRENT_PARTIES = "Current parties"; + + /** 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_EXPERIENCE_SUMMARY. */ private static final String POLITICAL_EXPERIENCE_SUMMARY = "Political Experience Summary"; + + /** The Constant POLITICIAN_RANKING. */ private static final String POLITICIAN_RANKING = "Politician Ranking"; + /** The Constant CURRENT_AND_PAST_ASSIGNMENTS_DESCRIPTION. */ // Description for total experience detail (tooltip) private static final String CURRENT_AND_PAST_ASSIGNMENTS_DESCRIPTION = "Summarized roles, responsibilities, and tenure influence"; + /** The Constant DESC_POLITICAL_EXPERIENCE. */ // Politically focused descriptions (~50 chars) private static final String DESC_POLITICAL_EXPERIENCE = "Experience metrics: roles shaping political influence."; + + /** The Constant DESC_ALL_PARTIES. */ private static final String DESC_ALL_PARTIES = "All parties: mapping legislative engagements."; + + /** The Constant DESC_CURRENT_PARTIES. */ private static final String DESC_CURRENT_PARTIES = "Current parties: active parliamentary presence."; + + /** The Constant DESC_PAGE_HISTORY. */ private static final String DESC_PAGE_HISTORY = "Visit history: tracing engagement over time."; + /** The Constant COMMAND_ALL_PARTIES. */ // Page mode commands private static final PageModeMenuCommand COMMAND_ALL_PARTIES = new PageModeMenuCommand( UserViews.POLITICIAN_RANKING_VIEW_NAME, PageMode.CHARTS, ChartIndicators.ALLPARTIES.toString()); + + /** The Constant COMMAND_CURRENT_PARTIES. */ private static final PageModeMenuCommand COMMAND_CURRENT_PARTIES = new PageModeMenuCommand( UserViews.POLITICIAN_RANKING_VIEW_NAME, PageMode.CHARTS, ChartIndicators.CURRENTPARTIES.toString()); + + /** The Constant COMMAND_DATAGRID. */ private static final PageModeMenuCommand COMMAND_DATAGRID = new PageModeMenuCommand( UserViews.POLITICIAN_RANKING_VIEW_NAME, PageMode.DATAGRID); + + /** The Constant COMMAND_OVERVIEW. */ private static final PageModeMenuCommand COMMAND_OVERVIEW = new PageModeMenuCommand( UserViews.POLITICIAN_RANKING_VIEW_NAME, PageMode.OVERVIEW); + + /** The Constant COMMAND_PAGEVISITHISTORY. */ private static final PageModeMenuCommand COMMAND_PAGEVISITHISTORY = new PageModeMenuCommand( UserViews.POLITICIAN_RANKING_VIEW_NAME, PageMode.PAGEVISITHISTORY); 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 e35b98e02c..e7ba94030b 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,6 +40,7 @@ @Service public final class UserHomeMenuItemFactoryImpl extends AbstractMenuItemFactoryImpl implements UserHomeMenuItemFactory { + /** The application menu item factory. */ @Autowired private ApplicationMenuItemFactory applicationMenuItemFactory; diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/pagemode/CardInfoRowUtil.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/pagemode/CardInfoRowUtil.java index 93e3200fc1..7932a24ba2 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/pagemode/CardInfoRowUtil.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/pagemode/CardInfoRowUtil.java @@ -201,14 +201,32 @@ public static final VerticalLayout createStatsContainer() { return layout; } + /** + * The Class LayoutConstants. + */ public static final class LayoutConstants { - public static final String CARD_TENURE = "card-tenure"; - public static final String CARD_EXPERIENCE = "card-experience-section"; - public static final String CARD_INFO_VALUE = "card-info-value"; - public static final String CARD_INFO_ICON = "card-info-icon"; - public static final String METRIC_LABEL = "metric-label"; + + /** The Constant CARD_TENURE. */ + public static final String CARD_TENURE = "card-tenure"; + + /** The Constant CARD_EXPERIENCE. */ + public static final String CARD_EXPERIENCE = "card-experience-section"; + + /** The Constant CARD_INFO_VALUE. */ + public static final String CARD_INFO_VALUE = "card-info-value"; + + /** The Constant CARD_INFO_ICON. */ + public static final String CARD_INFO_ICON = "card-info-icon"; + + /** The Constant METRIC_LABEL. */ + public static final String METRIC_LABEL = "metric-label"; } + /** + * Creates the standard row. + * + * @return the horizontal layout + */ public static HorizontalLayout createStandardRow() { final HorizontalLayout layout = new HorizontalLayout(); layout.setSpacing(true); @@ -216,6 +234,13 @@ public static HorizontalLayout createStandardRow() { return layout; } + /** + * Creates the icon label. + * + * @param icon the icon + * @param tooltip the tooltip + * @return the label + */ public static Label createIconLabel(VaadinIcons icon, String tooltip) { final Label iconLabel = new Label(icon.getHtml(), ContentMode.HTML); iconLabel.addStyleName(LayoutConstants.CARD_INFO_ICON); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/pagemode/DashboardViewOverviewPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/pagemode/DashboardViewOverviewPageModContentFactoryImpl.java index 91a7dbd1a5..2443095ec5 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/pagemode/DashboardViewOverviewPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/pagemode/DashboardViewOverviewPageModContentFactoryImpl.java @@ -77,19 +77,40 @@ @Component public final class DashboardViewOverviewPageModContentFactoryImpl extends AbstractBasicPageModContentFactoryImpl { + /** The Constant ORG_CODE_GOV_OFFICES. */ private static final String ORG_CODE_GOV_OFFICES = "202100-3831"; + + /** The Constant ORG_CODE_RIKSDAG. */ private static final String ORG_CODE_RIKSDAG = "202100-2627"; + + /** The Constant ORG_CODE_MONARCH. */ private static final String ORG_CODE_MONARCH = "202100-3484"; + + /** The Constant FINANCIAL. */ private static final String FINANCIAL = "Financial"; + + /** The Constant NAME. */ private static final String NAME = CommonsViews.DASHBOARD_VIEW_NAME; + + /** The Constant PAGE_PREFIX. */ private static final String PAGE_PREFIX = "#!"; + + /** The Constant PAGE_SEPARATOR. */ private static final char PAGE_SEPARATOR = '/'; + /** 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 esv api. */ @Autowired private EsvApi esvApi; @@ -137,6 +158,8 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina /** * Create a section for Monarch info. + * + * @param row the row */ private void createDashboardMonarch(final ResponsiveRow row) { final VerticalLayout monarchLayout = createLayoutWithTitle("Monarch"); @@ -154,6 +177,8 @@ private void createDashboardMonarch(final ResponsiveRow row) { /** * Create a section for Government info. + * + * @param row the row */ @SuppressWarnings("unchecked") private void createDashboardGovernment(final ResponsiveRow row) { @@ -201,6 +226,8 @@ private void createDashboardGovernment(final ResponsiveRow row) { /** * Create a section for Parliament info. + * + * @param row the row */ @SuppressWarnings("unchecked") private void createDashboardParliament(final ResponsiveRow row) { @@ -241,6 +268,8 @@ private void createDashboardParliament(final ResponsiveRow row) { /** * Create a section listing the number of risks by type. + * + * @param row the row */ private void createDashboardPartRiskByType(final ResponsiveRow row) { final VerticalLayout layout = createLayoutWithTitle("Number of risk by each type"); @@ -268,6 +297,8 @@ private void createDashboardPartRiskByType(final ResponsiveRow row) { /** * Create a section listing the number of risks by severity. + * + * @param row the row */ private void createDashboardPartRiskBySeverity(final ResponsiveRow row) { final VerticalLayout layout = createLayoutWithTitle("Number of risk by severity"); @@ -295,6 +326,13 @@ private void createDashboardPartRiskBySeverity(final ResponsiveRow row) { /** * Add income/spending overview for a given orgId. + * + * @param layout the layout + * @param orgId the org id + * @param linkTitle the link title + * @param incomeBillionSek the income billion sek + * @param spendingBillionSek the spending billion sek + * @param resultBillionSek the result billion sek */ private void addIncomeSpending(final VerticalLayout layout, String orgId, String linkTitle, int incomeBillionSek, int spendingBillionSek, int resultBillionSek) { @@ -320,6 +358,11 @@ private void addIncomeSpending(final VerticalLayout layout, String orgId, String /** * Add Parliament income and spending info. + * + * @param layout the layout + * @param orgId the org id + * @param linkTitle the link title + * @param spendingMSek the spending M sek */ private void addParliamentIncomeSpending(final VerticalLayout layout, String orgId, String linkTitle, int spendingMSek) { @@ -343,6 +386,8 @@ private void addParliamentIncomeSpending(final VerticalLayout layout, String org /** * Add Monarch income and spending info. + * + * @param layout the layout */ private void addMonarchIncomeSpending(final VerticalLayout layout) { addGovernmentBodyLink(layout, ORG_CODE_MONARCH, "Kungliga hov- och slottsstaten(The Royal Court)"); @@ -365,6 +410,10 @@ private void addMonarchIncomeSpending(final VerticalLayout layout) { /** * Create a statistic card with a given title and value. + * + * @param title the title + * @param value the value + * @return the counter statistics card */ private CounterStatisticsCard createStatisticCard(final String title, final int value) { return new CounterStatisticsCard( @@ -375,6 +424,9 @@ private CounterStatisticsCard createStatisticCard(final String title, final int /** * Create a vertical layout with a title label. + * + * @param title the title + * @return the vertical layout */ private static VerticalLayout createLayoutWithTitle(final String title) { final VerticalLayout layout = new VerticalLayout(); @@ -393,6 +445,9 @@ private static VerticalLayout createLayoutWithTitle(final String title) { /** * Add a full-width label to a layout. + * + * @param layout the layout + * @param text the text */ private static void addFullWidthLabel(final VerticalLayout layout, final String text) { final Label label = new Label(text); @@ -403,6 +458,10 @@ private static void addFullWidthLabel(final VerticalLayout layout, final String /** * Add a link to a government body page. + * + * @param layout the layout + * @param orgId the org id + * @param linkTitle the link title */ private void addGovernmentBodyLink(final VerticalLayout layout, final String orgId, final String linkTitle) { final Link pageLink = new Link(linkTitle, @@ -416,6 +475,9 @@ private void addGovernmentBodyLink(final VerticalLayout layout, final String org /** * Create a card showing headcount for a given orgId. + * + * @param panelContent the panel content + * @param orgId the org id */ private void createHeadCountCard(final Layout panelContent, final String orgId) { final Map> yearlyData = esvApi.getData().get(2024).stream() diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/pagemode/LeaderCardUtil.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/pagemode/LeaderCardUtil.java index 4693b98c59..da9091ad8e 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/pagemode/LeaderCardUtil.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/pagemode/LeaderCardUtil.java @@ -77,6 +77,11 @@ public Map> loadActivePoliticiansByPersonI return activePoliticians.stream().collect(Collectors.groupingBy(ViewRiksdagenPolitician::getPersonId)); } + /** + * Creates the base card. + * + * @return the panel + */ private Panel createBaseCard() { final Panel cardPanel = new Panel(); cardPanel.addStyleName("leader-baseball-card"); @@ -85,6 +90,11 @@ private Panel createBaseCard() { return cardPanel; } + /** + * Creates the card content. + * + * @return the vertical layout + */ private VerticalLayout createCardContent() { final VerticalLayout cardContent = new VerticalLayout(); cardContent.setMargin(true); @@ -93,6 +103,14 @@ private VerticalLayout createCardContent() { return cardContent; } + /** + * Adds the experience row. + * + * @param container the container + * @param govYears the gov years + * @param partyYears the party years + * @param parliamentYears the parliament years + */ private void addExperienceRow(VerticalLayout container, int govYears, int partyYears, int parliamentYears) { final HorizontalLayout experienceLayout = CardInfoRowUtil.createStandardRow(); experienceLayout.addStyleName(CardInfoRowUtil.LayoutConstants.CARD_EXPERIENCE); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/pagemode/MainViewLoginPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/pagemode/MainViewLoginPageModContentFactoryImpl.java index d51bb48054..cce856b761 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/pagemode/MainViewLoginPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/pagemode/MainViewLoginPageModContentFactoryImpl.java @@ -50,10 +50,13 @@ @Component public final class MainViewLoginPageModContentFactoryImpl extends AbstractBasicPageModContentFactoryImpl { + /** The Constant AS_LIST. */ private static final List AS_LIST = Arrays.asList( "email", "otpCode", "userpassword" ); + /** The Constant LOGIN. */ private static final String LOGIN = "Login"; + /** The Constant LOGIN_USER. */ private static final String LOGIN_USER = "Login user"; /** The Constant NAME. */ diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/pagemode/MainViewRegisterPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/pagemode/MainViewRegisterPageModContentFactoryImpl.java index af8d923535..15efa36b91 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/pagemode/MainViewRegisterPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/pagemode/MainViewRegisterPageModContentFactoryImpl.java @@ -49,11 +49,13 @@ @Component public final class MainViewRegisterPageModContentFactoryImpl extends AbstractBasicPageModContentFactoryImpl { + /** The Constant AS_LIST. */ private static final List AS_LIST = Arrays.asList( "username", "email", "country", "userpassword" ); /** The Constant NAME. */ public static final String NAME = CommonsViews.MAIN_VIEW_NAME; + /** The Constant REGISTER. */ private static final String REGISTER = "Register"; /** diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/pagemode/PartyLeaderUtil.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/pagemode/PartyLeaderUtil.java index d4be86861f..1064f02dcb 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/pagemode/PartyLeaderUtil.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/pagemode/PartyLeaderUtil.java @@ -13,8 +13,12 @@ */ public final class PartyLeaderUtil { + /** The Constant ROLE_CODE_PARTILEDARE. */ private static final String ROLE_CODE_PARTILEDARE = "Partiledare"; + /** + * Instantiates a new party leader util. + */ private PartyLeaderUtil() { // Utility class, no instantiation } @@ -60,6 +64,13 @@ public static Map computePartyLeaders(ApplicationManager applic return result; } + /** + * Gets the active roles. + * + * @param applicationManager the application manager + * @param personId the person id + * @return the active roles + */ @SuppressWarnings("unchecked") private static List getActiveRoles(ApplicationManager applicationManager, String personId) { return applicationManager.getDataContainer(ViewRiksdagenPartyRoleMember.class) @@ -70,6 +81,12 @@ private static List getActiveRoles(ApplicationMana ); } + /** + * Checks if is party leader role. + * + * @param role the role + * @return true, if is party leader role + */ private static boolean isPartyLeaderRole(ViewRiksdagenPartyRoleMember role) { return role.getRoleCode() != null && ROLE_CODE_PARTILEDARE.equalsIgnoreCase(role.getRoleCode().trim()); } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/pagemode/PoliticianLeaderboardUtil.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/pagemode/PoliticianLeaderboardUtil.java index fb49683420..2267763fd0 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/pagemode/PoliticianLeaderboardUtil.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/pagemode/PoliticianLeaderboardUtil.java @@ -272,6 +272,15 @@ public final void addMinistryRoleSummary(final VerticalLayout cardLayout, "Yearly Spending (B SEK)", spendingStr)); } + /** + * Builds the top string. + * + * @param the generic type + * @param items the items + * @param nameFunction the name function + * @param weightFunction the weight function + * @return the string + */ private String buildTopString(List items, java.util.function.Function nameFunction, java.util.function.Function weightFunction) { @@ -283,6 +292,15 @@ private String buildTopString(List items, .collect(Collectors.joining(", ")); } + /** + * Adds the metrics section. + * + * @param layout the layout + * @param sectionTitle the section title + * @param politician the politician + * @param ballotSummary the ballot summary + * @param metricType the metric type + */ @SuppressWarnings("unused") private void addMetricsSection(VerticalLayout layout, String sectionTitle, ViewRiksdagenPolitician politician, ViewRiksdagenPoliticianBallotSummary ballotSummary, @@ -305,10 +323,19 @@ private void addMetricsSection(VerticalLayout layout, String sectionTitle, layout.addComponent(sectionLayout); } + /** + * The Enum MetricType. + */ private enum MetricType { - PARLIAMENTARY, - LEGISLATIVE, - PARTY_ALIGNMENT + + /** The parliamentary. */ + PARLIAMENTARY, + + /** The legislative. */ + LEGISLATIVE, + + /** The party alignment. */ + PARTY_ALIGNMENT } } 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 93ac08ed12..f5327fa627 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,28 @@ public enum ChartIndicators { PARTYGENDER, /** The partywinner. */ - PARTYWINNER, GOVERNMENTBODIESHEADCOUNT, GOVERNMENTBODIESINCOME, GOVERNMENTBODIESEXPENDITURE, GOVERNMENTOUTCOME, ALLGOVERNMENTROLEGANTT, ALLMINISTRIESBYTOTALDAYS, RISKSUMMARY, RULEVIOLATION, DOCUMENTACTIVITY, DECISIONACTIVITY, DECISIONFLOW; + PARTYWINNER, + /** The governmentbodiesheadcount. */ + GOVERNMENTBODIESHEADCOUNT, + /** The governmentbodiesincome. */ + GOVERNMENTBODIESINCOME, + /** The governmentbodiesexpenditure. */ + GOVERNMENTBODIESEXPENDITURE, + /** The governmentoutcome. */ + GOVERNMENTOUTCOME, + /** The allgovernmentrolegantt. */ + ALLGOVERNMENTROLEGANTT, + /** The allministriesbytotaldays. */ + ALLMINISTRIESBYTOTALDAYS, + /** The risksummary. */ + RISKSUMMARY, + /** The ruleviolation. */ + RULEVIOLATION, + /** The documentactivity. */ + DOCUMENTACTIVITY, + /** The decisionactivity. */ + DECISIONACTIVITY, + /** The decisionflow. */ + DECISIONFLOW; } \ No newline at end of file diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/AbstractClickListener.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/AbstractClickListener.java index 3fd4f29a71..5da6b7d210 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/AbstractClickListener.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/AbstractClickListener.java @@ -28,6 +28,8 @@ /** * The Class AbstractClickListener. + * + * @see AbstractClickEvent */ abstract class AbstractClickListener { diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/AbstractPageItemRendererClickListener.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/AbstractPageItemRendererClickListener.java index 9a631ad407..827f894233 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/AbstractPageItemRendererClickListener.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/AbstractPageItemRendererClickListener.java @@ -27,8 +27,8 @@ /** * The class AbstractPageItemRendererClickListener. * - * @param - * the generic type + * @param the generic type + * @see AbstractPageItemRendererClickEvent */ public abstract class AbstractPageItemRendererClickListener implements PageItemRendererClickListener { diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/ApplicationLoginListener.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/ApplicationLoginListener.java index e4f4e49c58..8770c8c8d4 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/ApplicationLoginListener.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/ApplicationLoginListener.java @@ -32,6 +32,8 @@ /** * The Class ApplicationLoginListener. + * + * @see ApplicationLoginEvent */ public final class ApplicationLoginListener extends AbstractClickListener implements ClickListener { diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/ChangePasswordClickListener.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/ChangePasswordClickListener.java index f9adca65e2..0919089f82 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/ChangePasswordClickListener.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/ChangePasswordClickListener.java @@ -30,6 +30,8 @@ /** * The Class ChangePasswordClickListener. + * + * @see ChangePasswordClickEvent */ public class ChangePasswordClickListener extends AbstractClickListener implements ClickListener { @@ -38,7 +40,7 @@ public class ChangePasswordClickListener extends AbstractClickListener implement .getLogger(ChangePasswordClickListener.class); /** The Constant PROBLEM_CHANGING_PASSWORD. */ - private static final String PROBLEM_CHANGING_PASSWORD = "Problem changing password"; + public static final String PROBLEM_CHANGING_PASSWORD = "Problem changing password"; /** The Constant PROBLEM_CHANGING_PASSWORD_SESSIONID. */ private static final String PROBLEM_CHANGING_PASSWORD_SESSIONID = "Problem changing password, sessionid{}"; diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/CommitFormWrapperClickListener.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/CommitFormWrapperClickListener.java index 8773605b68..980f7fbe60 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/CommitFormWrapperClickListener.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/CommitFormWrapperClickListener.java @@ -24,6 +24,8 @@ /** * The Class CommitFormWrapperClickListener. + * + * @see CommitFormWrapperClickEvent */ public final class CommitFormWrapperClickListener implements ClickListener { diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/ComplianceCheckPageItemRendererClickListener.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/ComplianceCheckPageItemRendererClickListener.java index 4756010901..982d76cd36 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/ComplianceCheckPageItemRendererClickListener.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/ComplianceCheckPageItemRendererClickListener.java @@ -29,6 +29,8 @@ /** * The Class RuleViolationPageItemRendererClickListener. + * + * @see ComplianceCheckPageItemRendererClickEvent */ public final class ComplianceCheckPageItemRendererClickListener implements PageItemRendererClickListener { diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/DecisionFlowValueChangeListener.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/DecisionFlowValueChangeListener.java index 65eec63b8b..90a256a443 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/DecisionFlowValueChangeListener.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/DecisionFlowValueChangeListener.java @@ -26,6 +26,8 @@ /** * The Class DecisionFlowValueChangeListener. + * + * @see DecisionFlowValueChangeEvent */ public final class DecisionFlowValueChangeListener implements ValueChangeListener { diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/DeleteAccountClickListener.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/DeleteAccountClickListener.java index 0e8e76cdee..65f93b284e 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/DeleteAccountClickListener.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/DeleteAccountClickListener.java @@ -30,6 +30,8 @@ /** * The Class DeleteAccountClickListener. + * + * @see DeleteAccountClickEvent */ public class DeleteAccountClickListener extends AbstractClickListener implements ClickListener { diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/DisableGoogleAuthenticatorCredentialClickListener.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/DisableGoogleAuthenticatorCredentialClickListener.java index 81e7d5ee0b..4d2c7b7038 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/DisableGoogleAuthenticatorCredentialClickListener.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/DisableGoogleAuthenticatorCredentialClickListener.java @@ -30,6 +30,8 @@ /** * The Class DisableGoogleAuthenticatorCredentialClickListener. + * + * @see DisableGoogleAuthenticatorCredentialClickEvent */ public class DisableGoogleAuthenticatorCredentialClickListener extends AbstractClickListener implements ClickListener { diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/LogoutClickListener.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/LogoutClickListener.java index bc570b08bd..da2db8d201 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/LogoutClickListener.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/LogoutClickListener.java @@ -33,6 +33,8 @@ /** * The Class LogoutClickListener. + * + * @see LogoutClickEvent */ public class LogoutClickListener extends AbstractClickListener implements ClickListener { diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/ManageUserAccountClickListener.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/ManageUserAccountClickListener.java index 6b3cad350e..aa19a38753 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/ManageUserAccountClickListener.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/ManageUserAccountClickListener.java @@ -30,6 +30,8 @@ /** * The Class ManageUserAccountClickListener. + * + * @see ManageUserAccountClickEvent */ public class ManageUserAccountClickListener extends AbstractClickListener implements ClickListener { diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/PageItemPropertyClickListener.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/PageItemPropertyClickListener.java index 41b185cb0e..8e6bba4c3f 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/PageItemPropertyClickListener.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/PageItemPropertyClickListener.java @@ -28,6 +28,8 @@ /** * The Class PageItemPropertyClickListener. + * + * @see PageItemPropertyClickEvent */ public final class PageItemPropertyClickListener extends AbstractPageItemRendererClickListener { diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/PageItemRendererClickListener.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/PageItemRendererClickListener.java index 9a455b2de5..776503cd68 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/PageItemRendererClickListener.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/PageItemRendererClickListener.java @@ -24,8 +24,8 @@ /** * The Class PageItemRendererClickListener. * - * @param - * the generic type + * @param the generic type + * @see PageItemRendererClickEvent */ public interface PageItemRendererClickListener extends RendererClickListener, SelectionListener { diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/RefreshDataViewsClickListener.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/RefreshDataViewsClickListener.java index f3ce6e4b42..047324cc41 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/RefreshDataViewsClickListener.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/RefreshDataViewsClickListener.java @@ -25,6 +25,8 @@ /** * The Class RefreshDataViewsClickListener. + * + * @see RefreshDataViewsClickEvent */ public final class RefreshDataViewsClickListener extends AbstractClickListener implements ClickListener { diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/RegisterUserClickListener.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/RegisterUserClickListener.java index 5fc3200e3b..c5a0f0c5d8 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/RegisterUserClickListener.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/RegisterUserClickListener.java @@ -32,6 +32,8 @@ /** * The Class RegisterUserClickListener. + * + * @see RegisterUserClickEvent */ public final class RegisterUserClickListener extends AbstractClickListener implements ClickListener { diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/RemoveDataClickListener.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/RemoveDataClickListener.java index d3e5585da9..0b51b54322 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/RemoveDataClickListener.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/RemoveDataClickListener.java @@ -25,6 +25,8 @@ /** * The Class RemoveDataClickListener. + * + * @see RemoveDataClickEvent */ public class RemoveDataClickListener extends AbstractClickListener implements ClickListener { diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/RuleViolationPageItemRendererClickListener.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/RuleViolationPageItemRendererClickListener.java index 6e7a614608..4751d62784 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/RuleViolationPageItemRendererClickListener.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/RuleViolationPageItemRendererClickListener.java @@ -29,6 +29,8 @@ /** * The Class RuleViolationPageItemRendererClickListener. + * + * @see RuleViolationPageItemRendererClickEvent */ public final class RuleViolationPageItemRendererClickListener implements PageItemRendererClickListener { diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/SearchDocumentClickListener.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/SearchDocumentClickListener.java index 6e21f35379..828867584f 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/SearchDocumentClickListener.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/SearchDocumentClickListener.java @@ -31,6 +31,8 @@ /** * The Class SearchDocumentClickListener. + * + * @see SearchDocumentClickEvent */ public class SearchDocumentClickListener extends AbstractClickListener implements ClickListener { diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/SendEmailClickListener.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/SendEmailClickListener.java index 6b8dbde24f..6dedec4229 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/SendEmailClickListener.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/SendEmailClickListener.java @@ -30,6 +30,8 @@ /** * The Class SendEmailClickListener. + * + * @see SendEmailClickEvent */ public class SendEmailClickListener extends AbstractClickListener implements ClickListener { diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/SetGoogleAuthenticatorCredentialClickListener.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/SetGoogleAuthenticatorCredentialClickListener.java index ade3b183fc..224307756a 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/SetGoogleAuthenticatorCredentialClickListener.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/SetGoogleAuthenticatorCredentialClickListener.java @@ -38,6 +38,8 @@ /** * The Class SetGoogleAuthenticatorCredentialClickListener. + * + * @see SetGoogleAuthenticatorCredentialClickEvent */ public final class SetGoogleAuthenticatorCredentialClickListener extends AbstractClickListener implements ClickListener { diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/StartAgentClickListener.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/StartAgentClickListener.java index ab3123e49b..8df56cd9e4 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/StartAgentClickListener.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/StartAgentClickListener.java @@ -29,6 +29,8 @@ /** * The Class StartAgentClickListener. + * + * @see StartAgentClickEvent */ public final class StartAgentClickListener extends AbstractClickListener implements ClickListener { diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/UpdateApplicationConfigurationClickListener.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/UpdateApplicationConfigurationClickListener.java index fd174718af..e8387c2a80 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/UpdateApplicationConfigurationClickListener.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/UpdateApplicationConfigurationClickListener.java @@ -32,6 +32,8 @@ /** * The Class UpdateApplicationConfigurationClickListener. + * + * @see UpdateApplicationConfigurationClickEvent */ public class UpdateApplicationConfigurationClickListener extends AbstractClickListener implements ClickListener { diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/UpdateSearchIndexClickListener.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/UpdateSearchIndexClickListener.java index 7a5b0b12ba..1d6478a75b 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/UpdateSearchIndexClickListener.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/UpdateSearchIndexClickListener.java @@ -25,6 +25,8 @@ /** * The Class UpdateSearchIndexClickListener. + * + * @see UpdateSearchIndexClickEvent */ public class UpdateSearchIndexClickListener extends AbstractClickListener implements ClickListener { diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/ballot/pagemode/AbstractBallotPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/ballot/pagemode/AbstractBallotPageModContentFactoryImpl.java index 76a05bd4a2..fdee60fd68 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/ballot/pagemode/AbstractBallotPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/ballot/pagemode/AbstractBallotPageModContentFactoryImpl.java @@ -39,6 +39,7 @@ abstract class AbstractBallotPageModContentFactoryImpl extends AbstractItemPageM /** The Constant NAME. */ public static final String NAME = UserViews.BALLOT_VIEW_NAME; + /** The ballot menu item factory. */ @Autowired private BallotMenuItemFactory ballotMenuItemFactory; diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/ballot/pagemode/BallotChartsPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/ballot/pagemode/BallotChartsPageModContentFactoryImpl.java index 7b2672fe27..3dff21a32e 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/ballot/pagemode/BallotChartsPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/ballot/pagemode/BallotChartsPageModContentFactoryImpl.java @@ -59,6 +59,7 @@ @Component public final class BallotChartsPageModContentFactoryImpl extends AbstractBallotPageModContentFactoryImpl { + /** The ballot chart data manager. */ @Autowired private BallotChartDataManager ballotChartDataManager; @@ -124,7 +125,7 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina BallotViewConstants.CHARTS_SUBTITLE, BallotViewConstants.CHARTS_DESCRIPTION); } else { - CardInfoRowUtil.createPageHeader(panel, panelContent, + CardInfoRowUtil.createPageHeader(panel, panelContent, BallotViewConstants.CHARTS_TITLE_PREFIX + ballots.get(0).getEmbeddedId().getConcern(), BallotViewConstants.CHARTS_SUBTITLE, BallotViewConstants.CHARTS_DESCRIPTION); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/ballot/pagemode/BallotOverviewPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/ballot/pagemode/BallotOverviewPageModContentFactoryImpl.java index 0df4a8b556..9bcc733f57 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/ballot/pagemode/BallotOverviewPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/ballot/pagemode/BallotOverviewPageModContentFactoryImpl.java @@ -84,9 +84,6 @@ public final class BallotOverviewPageModContentFactoryImpl extends AbstractBallo private static final String[] NESTED_PROPERTIES = { "embeddedId.ballotId", "embeddedId.concern", "embeddedId.issue", EMBEDDED_ID_PARTY }; - /** The Constant PARTY_BALLOT_SUMMARY. */ - private static final String PARTY_BALLOT_SUMMARY = "Party Ballot Summary"; - /** * Instantiates a new ballot overview page mod content factory impl. */ @@ -224,9 +221,9 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina // Party Ballot Summary table getGridFactory().createBasicBeanItemNestedPropertiesGrid(panelContent, - ViewRiksdagenVoteDataBallotPartySummary.class, partyBallotList, + ViewRiksdagenVoteDataBallotPartySummary.class, partyBallotList, BallotViewConstants.GRID_PARTY_BALLOT_SUMMARY, - NESTED_PROPERTIES, COLUMN_ORDER, HIDE_COLUMNS, LISTENER, + NESTED_PROPERTIES, COLUMN_ORDER, HIDE_COLUMNS, LISTENER, BallotViewConstants.GRID_EMBEDDED_ID_PARTY, null); // Overview layout after table diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/ballot/pagemode/BallotViewConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/ballot/pagemode/BallotViewConstants.java index 7cc9309344..2ace1cbc84 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/ballot/pagemode/BallotViewConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/ballot/pagemode/BallotViewConstants.java @@ -4,38 +4,89 @@ * Constants for the ballot view pages. */ public interface BallotViewConstants { + + /** The overview main title prefix. */ // Overview page constants String OVERVIEW_MAIN_TITLE_PREFIX = "Ballot Overview "; + + /** The overview page description. */ String OVERVIEW_PAGE_DESCRIPTION = "Explore and analyze ballot results and voting statistics."; + + /** The overview card ballot info. */ String OVERVIEW_CARD_BALLOT_INFO = "Ballot Information"; + + /** The overview card ballot profile. */ String OVERVIEW_CARD_BALLOT_PROFILE = "Ballot Profile"; + + /** The overview card voting stats. */ String OVERVIEW_CARD_VOTING_STATS = "Voting Statistics"; - + + /** The grid party ballot summary. */ // Grid constants String GRID_PARTY_BALLOT_SUMMARY = "Party Ballot Summary"; + + /** The grid embedded id party. */ String GRID_EMBEDDED_ID_PARTY = "embeddedId.party"; - + + /** The field vote date. */ // Field labels String FIELD_VOTE_DATE = "Vote Date:"; + + /** The field title. */ String FIELD_TITLE = "Title:"; + + /** The field subtitle. */ String FIELD_SUBTITLE = "Subtitle:"; // Fixed: Added missing constant + + /** The field decision type. */ String FIELD_DECISION_TYPE = "Decision Type:"; + + /** The field concern. */ String FIELD_CONCERN = "Concern:"; + + /** The field ballot type. */ String FIELD_BALLOT_TYPE = "Ballot Type:"; + + /** The field winner. */ String FIELD_WINNER = "Winner:"; + + /** The field approved. */ String FIELD_APPROVED = "Approved:"; + + /** The field ballot id. */ String FIELD_BALLOT_ID = "Ballot ID:"; + + /** The field rm. */ String FIELD_RM = "RM:"; + + /** The field issue. */ String FIELD_ISSUE = "Issue:"; + + /** The field label. */ String FIELD_LABEL = "Label:"; + + /** The field total votes. */ String FIELD_TOTAL_VOTES = "Total Votes:"; + + /** The field yes votes. */ String FIELD_YES_VOTES = "Yes Votes:"; + + /** The field no votes. */ String FIELD_NO_VOTES = "No Votes:"; + + /** The field abstain votes. */ String FIELD_ABSTAIN_VOTES = "Abstain Votes:"; + + /** The field absent votes. */ String FIELD_ABSENT_VOTES = "Absent Votes:"; - + + /** The charts title prefix. */ // Charts page constants String CHARTS_TITLE_PREFIX = "Ballot Charts : "; + + /** The charts subtitle. */ String CHARTS_SUBTITLE = "Ballot Trends and Visualizations"; + + /** The charts description. */ String CHARTS_DESCRIPTION = "Provides insights into election trends by visualizing ballot data, assisting in strategic decision-making and voter engagement analysis."; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeActionConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeActionConstants.java index 2e5a91757e..d09eb934ab 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeActionConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeActionConstants.java @@ -1,21 +1,41 @@ package com.hack23.cia.web.impl.ui.application.views.user.committee.pagemode; +/** + * The Interface CommitteeActionConstants. + */ public interface CommitteeActionConstants { + + /** The df year selector. */ // Decision Flow String DF_YEAR_SELECTOR = "Select year"; - + + /** The dd title header. */ // Decision Data String DD_TITLE_HEADER = "Daily Committee Decisions "; + + /** The dd title. */ String DD_TITLE = "Summary of Decision Types"; + + /** The dd description. */ String DD_DESCRIPTION = "Displays a summary of daily committee decision-making activity."; + /** The ds title header. */ // Decision Summary String DS_TITLE_HEADER = "Committee Decision Summary"; + + /** The ds title. */ String DS_TITLE = "Decision Summary"; + + /** The ds description. */ String DS_DESCRIPTION = "Overview of decisions made by the committee."; - + + /** The bd title header. */ // Ballot Decision String BD_TITLE_HEADER = "Committee Ballot Decision Summary "; + + /** The bd title. */ String BD_TITLE = "Ballot Decision Summary"; + + /** The bd description. */ String BD_DESCRIPTION = "Summary of ballot decisions made by the specified committee."; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeBallotConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeBallotConstants.java index c5694e174f..d6da984144 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeBallotConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeBallotConstants.java @@ -1,9 +1,17 @@ package com.hack23.cia.web.impl.ui.application.views.user.committee.pagemode; +/** + * The Interface CommitteeBallotConstants. + */ public interface CommitteeBallotConstants { + + /** The ballot id. */ String BALLOT_ID = "ballotId"; + + /** The committee ballot decision summary. */ String COMMITTEE_BALLOT_DECISION_SUMMARY = "Committee Ballot Decision Summary"; - + + /** The ballot column order. */ String[] BALLOT_COLUMN_ORDER = { "voteDate", "embeddedId.concern", "embeddedId.id", "committeeReport", "embeddedId.issue", "rm", "title", "subTitle", "endNumber", "org", "createdDate", "publicDate", "ballotId", "decisionType", "againstProposalParties", "againstProposalNumber", "winner", @@ -11,11 +19,13 @@ public interface CommitteeBallotConstants { "approved", "noWinner", "percentageYes", "percentageNo", "percentageAbsent", "percentageAbstain", "percentageMale" }; + /** The ballot hide columns. */ String[] BALLOT_HIDE_COLUMNS = { "embeddedId", "embeddedId.id", "endNumber", "org", "createdDate", "publicDate", "ballotId", "decisionType", "label", "againstProposalNumber", "avgBornYear", "percentageMale", "approved", "noWinner", "ballotType", "percentageYes", "percentageNo", "percentageAbsent", "percentageAbstain" }; + /** The ballot nested properties. */ String[] BALLOT_NESTED_PROPERTIES = { "embeddedId.concern", "embeddedId.issue", "embeddedId.id" }; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeBallotDecisionSummaryPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeBallotDecisionSummaryPageModContentFactoryImpl.java index 6e16ab0e41..cae93f45f8 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeBallotDecisionSummaryPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeBallotDecisionSummaryPageModContentFactoryImpl.java @@ -48,8 +48,10 @@ public final class CommitteeBallotDecisionSummaryPageModContentFactoryImpl extends AbstractCommitteePageModContentFactoryImpl { + /** The Constant BALLOT_ID. */ private static final String BALLOT_ID = "ballotId"; + /** The Constant COLUMN_ORDER. */ private static final String[] COLUMN_ORDER = { "voteDate", "embeddedId.concern", "embeddedId.id", "committeeReport", "embeddedId.issue", "rm", "title", "subTitle", "endNumber", "org", "createdDate", "publicDate", BALLOT_ID, "decisionType", "againstProposalParties", "againstProposalNumber", "winner", @@ -57,16 +59,20 @@ public final class CommitteeBallotDecisionSummaryPageModContentFactoryImpl "approved", "noWinner", "percentageYes", "percentageNo", "percentageAbsent", "percentageAbstain", "percentageMale" }; + /** The Constant COMMITTEE_BALLOT_DECISION_SUMMARY. */ private static final String COMMITTEE_BALLOT_DECISION_SUMMARY = "Committee Ballot Decision Summary"; + /** The Constant HIDE_COLUMNS. */ private static final String[] HIDE_COLUMNS = { "embeddedId", "embeddedId.id", "endNumber", "org", "createdDate", "publicDate", BALLOT_ID, "decisionType", "label", "againstProposalNumber", "avgBornYear", "percentageMale", "approved", "noWinner", "ballotType", "percentageYes", "percentageNo", "percentageAbsent", "percentageAbstain" }; + /** The Constant LISTENER. */ private static final PageItemPropertyClickListener LISTENER = new PageItemPropertyClickListener( UserViews.BALLOT_VIEW_NAME, BALLOT_ID); + /** The Constant NESTED_PROPERTIES. */ private static final String[] NESTED_PROPERTIES = { "embeddedId.concern", "embeddedId.issue", "embeddedId.id" }; @@ -88,9 +94,9 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina final ViewRiksdagenCommittee viewRiksdagenCommittee = getItem(parameters); getCommitteeMenuItemFactory().createCommitteeeMenuBar(menuBar, pageId); - CardInfoRowUtil.createPageHeader(panel, panelContent, - CommitteeViewConstants.BD_TITLE_HEADER + viewRiksdagenCommittee.getEmbeddedId().getDetail(), - CommitteeViewConstants.BD_TITLE, + CardInfoRowUtil.createPageHeader(panel, panelContent, + CommitteeViewConstants.BD_TITLE_HEADER + viewRiksdagenCommittee.getEmbeddedId().getDetail(), + CommitteeViewConstants.BD_TITLE, CommitteeViewConstants.BD_DESCRIPTION); final DataContainer committeeBallotDecisionPartyDataContainer = getApplicationManager() diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeCurrentMembersHistoryPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeCurrentMembersHistoryPageModContentFactoryImpl.java index 087866ffb8..21eed2f08e 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeCurrentMembersHistoryPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeCurrentMembersHistoryPageModContentFactoryImpl.java @@ -44,6 +44,7 @@ public final class CommitteeCurrentMembersHistoryPageModContentFactoryImpl extends AbstractCommitteePageModContentFactoryImpl { + /** The Constant LISTENER. */ private static final PageItemPropertyClickListener LISTENER = new PageItemPropertyClickListener( UserViews.POLITICIAN_VIEW_NAME, "personId"); @@ -66,9 +67,9 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina final ViewRiksdagenCommittee viewRiksdagenCommittee = getItem(parameters); getCommitteeMenuItemFactory().createCommitteeeMenuBar(menuBar, pageId); - CardInfoRowUtil.createPageHeader(panel, panelContent, - CommitteeViewConstants.CM_TITLE_HEADER + viewRiksdagenCommittee.getEmbeddedId().getDetail(), - CommitteeViewConstants.CM_TITLE, + CardInfoRowUtil.createPageHeader(panel, panelContent, + CommitteeViewConstants.CM_TITLE_HEADER + viewRiksdagenCommittee.getEmbeddedId().getDetail(), + CommitteeViewConstants.CM_TITLE, CommitteeViewConstants.CM_DESCRIPTION); final DataContainer committeeRoleMemberDataContainer = getApplicationManager() diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeDecisionFlowPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeDecisionFlowPageModContentFactoryImpl.java index b83ff23789..c93e97f06e 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeDecisionFlowPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeDecisionFlowPageModContentFactoryImpl.java @@ -59,10 +59,6 @@ public final class CommitteeDecisionFlowPageModContentFactoryImpl extends Abstra /** The Constant DEFAULT_YEAR. */ private static final String DEFAULT_YEAR = "2023/24"; - /** The Constant YEAR_SELECTOR_LABEL. */ - private static final String YEAR_SELECTOR_LABEL = "Select year"; - - /** The decision flow chart manager. */ @Autowired private DecisionFlowChartManager decisionFlowChartManager; diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeDecisionSummaryPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeDecisionSummaryPageModContentFactoryImpl.java index ff6c264b51..f88b729b00 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeDecisionSummaryPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeDecisionSummaryPageModContentFactoryImpl.java @@ -46,8 +46,10 @@ public final class CommitteeDecisionSummaryPageModContentFactoryImpl extends AbstractCommitteePageModContentFactoryImpl { + /** The Constant BALLOT_ID. */ private static final String BALLOT_ID = "ballotId"; + /** The Constant COLUMN_ORDER. */ private static final String[] COLUMN_ORDER = { "createdDate", "publicDate", "committeeReport", "embeddedId.hangarId", "embeddedId.id", "embeddedId.issueNummer", "rm", "decisionType", "winner", "title", "header", "endNumber", "org", "committeeProposalUrlXml", BALLOT_ID, "againstProposalParties", @@ -56,13 +58,16 @@ public final class CommitteeDecisionSummaryPageModContentFactoryImpl /** The Constant DECISION_SUMMARY. */ private static final String DECISION_SUMMARY = "Decision Summary"; + /** The Constant HIDE_COLUMNS. */ private static final String[] HIDE_COLUMNS = { "embeddedId", "embeddedId.hangarId", "embeddedId.id", "endNumber", "org", "committeeProposalUrlXml", BALLOT_ID, "againstProposalParties", "againstProposalNumber", "createdDate" }; + /** The Constant LISTENER. */ private static final PageItemPropertyClickListener LISTENER = new PageItemPropertyClickListener( UserViews.BALLOT_VIEW_NAME, BALLOT_ID); + /** The Constant NESTED_PROPERTIES. */ private static final String[] NESTED_PROPERTIES = { "embeddedId.hangarId", "embeddedId.id", "embeddedId.issueNummer" }; diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeDecisionTypeDailySummaryPageModContentFactoryImpl2.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeDecisionTypeDailySummaryPageModContentFactoryImpl2.java index 86a3feb753..ea46f7d7fe 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeDecisionTypeDailySummaryPageModContentFactoryImpl2.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeDecisionTypeDailySummaryPageModContentFactoryImpl2.java @@ -63,9 +63,9 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina final ViewRiksdagenCommittee viewRiksdagenCommittee = getItem(parameters); getCommitteeMenuItemFactory().createCommitteeeMenuBar(menuBar, pageId); - CardInfoRowUtil.createPageHeader(panel, panelContent, - CommitteeViewConstants.DD_TITLE_HEADER + viewRiksdagenCommittee.getEmbeddedId().getDetail(), - CommitteeViewConstants.DD_TITLE, + CardInfoRowUtil.createPageHeader(panel, panelContent, + CommitteeViewConstants.DD_TITLE_HEADER + viewRiksdagenCommittee.getEmbeddedId().getDetail(), + CommitteeViewConstants.DD_TITLE, CommitteeViewConstants.DD_DESCRIPTION); chartDataManager.createDecisionTypeChart(panelContent, viewRiksdagenCommittee.getEmbeddedId().getOrgCode()); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeDocumentActivityPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeDocumentActivityPageModContentFactoryImpl.java index f1a595e29f..4d4fd2709c 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeDocumentActivityPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeDocumentActivityPageModContentFactoryImpl.java @@ -63,9 +63,9 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina final ViewRiksdagenCommittee viewRiksdagenCommittee = getItem(parameters); getCommitteeMenuItemFactory().createCommitteeeMenuBar(menuBar, pageId); - CardInfoRowUtil.createPageHeader(panel, panelContent, - CommitteeViewConstants.DA_TITLE_HEADER + viewRiksdagenCommittee.getEmbeddedId().getDetail(), - CommitteeViewConstants.DA_TITLE, + CardInfoRowUtil.createPageHeader(panel, panelContent, + CommitteeViewConstants.DA_TITLE_HEADER + viewRiksdagenCommittee.getEmbeddedId().getDetail(), + CommitteeViewConstants.DA_TITLE, CommitteeViewConstants.DA_DESCRIPTION); chartDataManager.createDocumentHistoryChartByOrg(panelContent, diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeDocumentHistoryPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeDocumentHistoryPageModContentFactoryImpl.java index 27e9ece239..8dabe522da 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeDocumentHistoryPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeDocumentHistoryPageModContentFactoryImpl.java @@ -44,6 +44,7 @@ public final class CommitteeDocumentHistoryPageModContentFactoryImpl extends AbstractCommitteePageModContentFactoryImpl { + /** The Constant LISTENER. */ private static final PageItemPropertyClickListener LISTENER = new PageItemPropertyClickListener( UserViews.DOCUMENT_VIEW_NAME, "docId", true); @@ -66,9 +67,9 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina getCommitteeMenuItemFactory().createCommitteeeMenuBar(menuBar, pageId); - CardInfoRowUtil.createPageHeader(panel, panelContent, - CommitteeViewConstants.DH_TITLE_HEADER + viewRiksdagenCommittee.getEmbeddedId().getDetail(), - CommitteeViewConstants.DH_TITLE, + CardInfoRowUtil.createPageHeader(panel, panelContent, + CommitteeViewConstants.DH_TITLE_HEADER + viewRiksdagenCommittee.getEmbeddedId().getDetail(), + CommitteeViewConstants.DH_TITLE, CommitteeViewConstants.DH_DESCRIPTION); final DataContainer politicianDocumentDataContainer = getApplicationManager() diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeGridConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeGridConstants.java index 0a158c36ba..34bd7ffb24 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeGridConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeGridConstants.java @@ -1,31 +1,53 @@ package com.hack23.cia.web.impl.ui.application.views.user.committee.pagemode; +/** + * The Interface CommitteeGridConstants. + */ public interface CommitteeGridConstants { + + /** The member history grid name. */ // Member History Grid String MEMBER_HISTORY_GRID_NAME = "Member History"; + + /** The member history column order. */ String[] MEMBER_HISTORY_COLUMN_ORDER = { "roleCode", "roleId", "personId", "firstName", "lastName", "party", "active", "totalDaysServed", "detail", "fromDate", "toDate" }; + + /** The member history hidden columns. */ String[] MEMBER_HISTORY_HIDDEN_COLUMNS = { "roleId", "personId", "detail" }; + /** The current members grid name. */ // Current Members Grid String CURRENT_MEMBERS_GRID_NAME = "Current Members"; + + /** The current members hidden columns. */ String[] CURRENT_MEMBERS_HIDDEN_COLUMNS = { "roleId", "personId", "detail", "active" }; + /** The document history grid name. */ // Document History Grid String DOCUMENT_HISTORY_GRID_NAME = "Documents"; + + /** The document history column order. */ String[] DOCUMENT_HISTORY_COLUMN_ORDER = { "rm", "madePublicDate", "id", "docId", - "personReferenceId", "roleDescription", "title", "subTitle", "documentType", "subType", - "org", "label", "numberValue", "status", "tempLabel", "orderNumber", "referenceName", + "personReferenceId", "roleDescription", "title", "subTitle", "documentType", "subType", + "org", "label", "numberValue", "status", "tempLabel", "orderNumber", "referenceName", "partyShortCode" }; + + /** The document history hidden columns. */ String[] DOCUMENT_HISTORY_HIDDEN_COLUMNS = { "id", "numberValue", "orderNumber", "tempLabel", "personReferenceId", "org", "docId", "label", "roleDescription" }; + /** The decision summary grid name. */ // Decision Summary Grid String DECISION_SUMMARY_GRID_NAME = "Decision Summary"; + + /** The decision summary column order. */ String[] DECISION_SUMMARY_COLUMN_ORDER = { "createdDate", "publicDate", "committeeReport", "embeddedId.hangarId", "embeddedId.id", "embeddedId.issueNummer", "rm", "decisionType", "winner", "title", "header", "endNumber", "org", "committeeProposalUrlXml", "ballotId", "againstProposalParties", "againstProposalNumber" }; + + /** The decision summary hidden columns. */ String[] DECISION_SUMMARY_HIDDEN_COLUMNS = { "embeddedId", "embeddedId.hangarId", "embeddedId.id", "endNumber", "org", "committeeProposalUrlXml", "ballotId", "againstProposalParties", "againstProposalNumber", "createdDate" }; diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeMemberHistoryPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeMemberHistoryPageModContentFactoryImpl.java index 69e21590b7..e2633551ca 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeMemberHistoryPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeMemberHistoryPageModContentFactoryImpl.java @@ -43,12 +43,10 @@ @Component public final class CommitteeMemberHistoryPageModContentFactoryImpl extends AbstractCommitteePageModContentFactoryImpl { + /** The Constant LISTENER. */ private static final PageItemPropertyClickListener LISTENER = new PageItemPropertyClickListener( UserViews.POLITICIAN_VIEW_NAME, "personId"); - /** The Constant MEMBER_HISTORY. */ - private static final String MEMBER_HISTORY = "Member History"; - /** * Instantiates a new committee member history page mod content factory * impl. @@ -68,9 +66,9 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina getCommitteeMenuItemFactory().createCommitteeeMenuBar(menuBar, pageId); - CardInfoRowUtil.createPageHeader(panel, panelContent, - CommitteeViewConstants.MH_TITLE_HEADER + viewRiksdagenCommittee.getEmbeddedId().getDetail(), - CommitteeViewConstants.MH_TITLE, + CardInfoRowUtil.createPageHeader(panel, panelContent, + CommitteeViewConstants.MH_TITLE_HEADER + viewRiksdagenCommittee.getEmbeddedId().getDetail(), + CommitteeViewConstants.MH_TITLE, CommitteeViewConstants.MH_DESCRIPTION); final DataContainer committeeRoleMemberDataContainer = getApplicationManager() @@ -79,7 +77,7 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina getGridFactory().createBasicBeanItemGrid(panelContent, ViewRiksdagenCommitteeRoleMember.class, committeeRoleMemberDataContainer.getAllBy(ViewRiksdagenCommitteeRoleMember_.detail, viewRiksdagenCommittee.getEmbeddedId().getDetail()), - CommitteeGridConstants.MEMBER_HISTORY_GRID_NAME, + CommitteeGridConstants.MEMBER_HISTORY_GRID_NAME, CommitteeGridConstants.MEMBER_HISTORY_COLUMN_ORDER, CommitteeGridConstants.MEMBER_HISTORY_HIDDEN_COLUMNS, LISTENER, null, null); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteePageTitleConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteePageTitleConstants.java index f4de3911ce..b5c6ffce7b 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteePageTitleConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteePageTitleConstants.java @@ -1,43 +1,87 @@ package com.hack23.cia.web.impl.ui.application.views.user.committee.pagemode; +/** + * The Interface CommitteePageTitleConstants. + */ public interface CommitteePageTitleConstants { + + /** The rg title header. */ // Role Ghant String RG_TITLE_HEADER = "Committee Role Gantt Chart "; + + /** The rg title. */ String RG_TITLE = "Role Timeline"; + + /** The rg description. */ String RG_DESCRIPTION = "Visualize the timeline and duration of roles within the committee, highlighting key assignments and transitions."; + /** The ov title header. */ // Overview String OV_TITLE_HEADER = "Committee Overview "; + + /** The ov title. */ String OV_TITLE = "Committee Details"; + + /** The ov description. */ String OV_DESCRIPTION = "Detailed insights into parliamentary committees and their activities."; - + + /** The mh title header. */ // Member History String MH_TITLE_HEADER = "Member History "; + + /** The mh title. */ String MH_TITLE = "Committee Member Participation History"; + + /** The mh description. */ String MH_DESCRIPTION = "Analyzes and presents participation trends for committee members."; + /** The dh title header. */ // Document History String DH_TITLE_HEADER = "Document History "; + + /** The dh title. */ String DH_TITLE = "Committee Document History"; + + /** The dh description. */ String DH_DESCRIPTION = "Displays the historical progression of documents managed by committees."; + /** The cm title header. */ // Current Members String CM_TITLE_HEADER = "Committee History "; + + /** The cm title. */ String CM_TITLE = "Current Members History"; + + /** The cm description. */ String CM_DESCRIPTION = "Tracks and presents historical data about committee members' participation."; + /** The df title header. */ // Decision Flow String DF_TITLE_HEADER = "Committee Decision Flow "; + + /** The df title. */ String DF_TITLE = "Decision Flow"; + + /** The df description. */ String DF_DESCRIPTION = "Analyze decision-making processes within committees."; + /** The da title header. */ // Document Activity String DA_TITLE_HEADER = "Committee Documents "; + + /** The da title. */ String DA_TITLE = "Document Activity Overview"; + + /** The da description. */ String DA_DESCRIPTION = "Tracks and visualizes the activity associated with committee documents."; + /** The pv title header. */ // Page Visit History String PV_TITLE_HEADER = "Committee Visits"; + + /** The pv title. */ String PV_TITLE = "Page Visit History for Committees"; + + /** The pv description. */ String PV_DESCRIPTION = "Tracks user interaction with committee pages for analytical purposes."; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteePageVisitHistoryPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteePageVisitHistoryPageModContentFactoryImpl.java index 08fbbd8a12..e220002b36 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteePageVisitHistoryPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteePageVisitHistoryPageModContentFactoryImpl.java @@ -56,9 +56,9 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina getItem(parameters); getCommitteeMenuItemFactory().createCommitteeeMenuBar(menuBar, pageId); - CardInfoRowUtil.createPageHeader(panel, panelContent, - CommitteeViewConstants.PV_TITLE_HEADER, - CommitteeViewConstants.PV_TITLE, + CardInfoRowUtil.createPageHeader(panel, panelContent, + CommitteeViewConstants.PV_TITLE_HEADER, + CommitteeViewConstants.PV_TITLE, CommitteeViewConstants.PV_DESCRIPTION); createPageVisitHistory(NAME, pageId, panelContent); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeRankingAllCommitteesChartsPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeRankingAllCommitteesChartsPageModContentFactoryImpl.java index 9f0359aa57..3480eab61f 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeRankingAllCommitteesChartsPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeRankingAllCommitteesChartsPageModContentFactoryImpl.java @@ -73,7 +73,7 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina final String pageId = getPageId(parameters); - CardInfoRowUtil.createPageHeader(panel, panelContent, + CardInfoRowUtil.createPageHeader(panel, panelContent, CommitteeViewConstants.CR_ALL_TITLE_HEADER, CommitteeViewConstants.CR_ALL_TITLE, CommitteeViewConstants.CR_ALL_DESCRIPTION); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeRankingConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeRankingConstants.java index b9d143ac33..158c0f2087 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeRankingConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeRankingConstants.java @@ -1,38 +1,77 @@ package com.hack23.cia.web.impl.ui.application.views.user.committee.pagemode; +/** + * The Interface CommitteeRankingConstants. + */ public interface CommitteeRankingConstants { + + /** The cr overview title header. */ // Committee Ranking Overview String CR_OVERVIEW_TITLE_HEADER = "Committee Rankings"; + + /** The cr overview title. */ String CR_OVERVIEW_TITLE = "Ranking Details"; + + /** The cr overview description. */ String CR_OVERVIEW_DESCRIPTION = "Analyze and compare rankings of parliamentary committees based on performance."; + /** The cr grid title header. */ // Committee Ranking Data Grid String CR_GRID_TITLE_HEADER = "Committee Ranking Overview"; + + /** The cr grid title. */ String CR_GRID_TITLE = "Committee Rankings"; + + /** The cr grid description. */ String CR_GRID_DESCRIPTION = "Analyze committee rankings with a focus on membership, performance, and activity metrics."; + /** The cr visit title header. */ // Committee Ranking Visit History String CR_VISIT_TITLE_HEADER = "Committee Rankings"; + + /** The cr visit title. */ String CR_VISIT_TITLE = "Page Visit History"; + + /** The cr visit description. */ String CR_VISIT_DESCRIPTION = "Tracks and visualizes the history of page visits for committee rankings."; + /** The cr all title header. */ // All Committees Charts String CR_ALL_TITLE_HEADER = "Committee Rankings"; + + /** The cr all title. */ String CR_ALL_TITLE = "Ranking of All Committees"; + + /** The cr all description. */ String CR_ALL_DESCRIPTION = "Provides comparative rankings for committees based on performance or metrics."; + /** The cr current title header. */ // Current Committees Charts String CR_CURRENT_TITLE_HEADER = "Committee Rankings"; + + /** The cr current title. */ String CR_CURRENT_TITLE = "Current Committees"; + + /** The cr current description. */ String CR_CURRENT_DESCRIPTION = "Provides comparative rankings for committees based on performance or metrics."; + /** The cr party title header. */ // Committee by Party Charts String CR_PARTY_TITLE_HEADER = "Committee Rankings"; + + /** The cr party title. */ String CR_PARTY_TITLE = "Committee by Party Charts Overview"; + + /** The cr party description. */ String CR_PARTY_DESCRIPTION = "Provides comparative rankings for committees based on performance or metrics."; + /** The cr current party title header. */ // Current Committee Parties Charts String CR_CURRENT_PARTY_TITLE_HEADER = "Committee Rankings"; + + /** The cr current party title. */ String CR_CURRENT_PARTY_TITLE = "Current Committee Parties Charts Overview"; + + /** The cr current party description. */ String CR_CURRENT_PARTY_DESCRIPTION = "Provides comparative rankings for committees based on performance or metrics."; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeRoleGhantPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeRoleGhantPageModContentFactoryImpl.java index d04d433c9b..ffc6231a0a 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeRoleGhantPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeRoleGhantPageModContentFactoryImpl.java @@ -45,6 +45,7 @@ @Component public final class CommitteeRoleGhantPageModContentFactoryImpl extends AbstractCommitteePageModContentFactoryImpl { + /** The committee ghant chart manager. */ @Autowired private CommitteeGhantChartManager committeeGhantChartManager; @@ -64,9 +65,9 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina final ViewRiksdagenCommittee viewRiksdagenCommittee = getItem(parameters); getCommitteeMenuItemFactory().createCommitteeeMenuBar(menuBar, pageId); - CardInfoRowUtil.createPageHeader(panel, panelContent, - CommitteeViewConstants.RG_TITLE_HEADER + viewRiksdagenCommittee.getEmbeddedId().getDetail(), - CommitteeViewConstants.RG_TITLE, + CardInfoRowUtil.createPageHeader(panel, panelContent, + CommitteeViewConstants.RG_TITLE_HEADER + viewRiksdagenCommittee.getEmbeddedId().getDetail(), + CommitteeViewConstants.RG_TITLE, CommitteeViewConstants.RG_DESCRIPTION); final DataContainer committeeRoleMemberDataContainer = getApplicationManager() diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeSectionConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeSectionConstants.java index 25618e215f..6738d2123e 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeSectionConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeSectionConstants.java @@ -1,7 +1,16 @@ package com.hack23.cia.web.impl.ui.application.views.user.committee.pagemode; +/** + * The Interface CommitteeSectionConstants. + */ public interface CommitteeSectionConstants { + + /** The ov section profile. */ String OV_SECTION_PROFILE = "Committee Profile"; + + /** The ov section membership. */ String OV_SECTION_MEMBERSHIP = "Membership Statistics"; + + /** The ov section document. */ String OV_SECTION_DOCUMENT = "Document Statistics"; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeViewConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeViewConstants.java index fa822b2e0b..2e5697f42d 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeViewConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeViewConstants.java @@ -3,7 +3,7 @@ /** * Constants for the committee view pages. */ -public interface CommitteeViewConstants extends +public interface CommitteeViewConstants extends CommitteePageTitleConstants, CommitteeSectionConstants, CommitteeActionConstants, diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/country/pagemode/CountryIndicatorConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/country/pagemode/CountryIndicatorConstants.java index 04e9da7ece..bb17555edb 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/country/pagemode/CountryIndicatorConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/country/pagemode/CountryIndicatorConstants.java @@ -1,18 +1,37 @@ package com.hack23.cia.web.impl.ui.application.views.user.country.pagemode; +/** + * The Interface CountryIndicatorConstants. + */ public interface CountryIndicatorConstants { + + /** The indicator summary header. */ // Indicator Card Labels String INDICATOR_SUMMARY_HEADER = "Indicator Summary"; + + /** The indicator name label. */ String INDICATOR_NAME_LABEL = "Indicator Name:"; + + /** The source value label. */ String SOURCE_VALUE_LABEL = "Source Value:"; + + /** The source org label. */ String SOURCE_ORG_LABEL = "Source Organization:"; + /** The indicator name tooltip. */ // Tooltips String INDICATOR_NAME_TOOLTIP = "Name of the indicator"; + + /** The source value tooltip. */ String SOURCE_VALUE_TOOLTIP = "Source of this indicator data"; + + /** The source org tooltip. */ String SOURCE_ORG_TOOLTIP = "Organization providing this data"; + /** The indicator summary card style. */ // Styles String INDICATOR_SUMMARY_CARD_STYLE = "indicator-summary-card"; + + /** The section header style. */ String SECTION_HEADER_STYLE = "section-header"; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/country/pagemode/CountryPageTitleConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/country/pagemode/CountryPageTitleConstants.java index 293f296c61..e4545ff49f 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/country/pagemode/CountryPageTitleConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/country/pagemode/CountryPageTitleConstants.java @@ -1,13 +1,27 @@ package com.hack23.cia.web.impl.ui.application.views.user.country.pagemode; +/** + * The Interface CountryPageTitleConstants. + */ public interface CountryPageTitleConstants { + + /** The ranking overview title. */ // Rankings Overview String RANKING_OVERVIEW_TITLE = "Country Rankings"; + + /** The ranking overview subtitle. */ String RANKING_OVERVIEW_SUBTITLE = "Ranking Overview"; + + /** The ranking overview desc. */ String RANKING_OVERVIEW_DESC = "Visualize and compare country-level political or economic indicators."; + /** The indicator title. */ // Indicators String INDICATOR_TITLE = "Country Indicator"; + + /** The indicator subtitle. */ String INDICATOR_SUBTITLE = "Country Indicator"; + + /** The indicator desc. */ String INDICATOR_DESC = "Compare key performance indicators across multiple countries."; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/country/pagemode/CountryRankingConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/country/pagemode/CountryRankingConstants.java index efed3a61dd..dc26e787ac 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/country/pagemode/CountryRankingConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/country/pagemode/CountryRankingConstants.java @@ -1,13 +1,27 @@ package com.hack23.cia.web.impl.ui.application.views.user.country.pagemode; +/** + * The Interface CountryRankingConstants. + */ public interface CountryRankingConstants { + + /** The chart title. */ // Chart Labels String CHART_TITLE = "Country Rankings"; + + /** The chart subtitle. */ String CHART_SUBTITLE = "Comparative Analysis"; + + /** The chart desc. */ String CHART_DESC = "Visual comparison of country rankings"; + /** The grid title. */ // Grid Labels String GRID_TITLE = "Rankings"; + + /** The grid subtitle. */ String GRID_SUBTITLE = "Detailed Rankings"; + + /** The grid desc. */ String GRID_DESC = "Detailed view of country rankings and metrics"; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/country/pagemode/CountryViewConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/country/pagemode/CountryViewConstants.java index f688c0de3a..e5904117df 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/country/pagemode/CountryViewConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/country/pagemode/CountryViewConstants.java @@ -3,7 +3,7 @@ /** * Constants for the country view pages. */ -public interface CountryViewConstants extends +public interface CountryViewConstants extends CountryPageTitleConstants, CountryIndicatorConstants, CountryRankingConstants { diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/AbstractDocumentPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/AbstractDocumentPageModContentFactoryImpl.java index 7f9d9d3ec4..4a47744766 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/AbstractDocumentPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/AbstractDocumentPageModContentFactoryImpl.java @@ -33,6 +33,7 @@ abstract class AbstractDocumentPageModContentFactoryImpl extends AbstractItemPag /** The Constant NAME. */ public static final String NAME = UserViews.DOCUMENT_VIEW_NAME; + /** The document menu item factory. */ @Autowired private DocumentMenuItemFactory documentMenuItemFactory; diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/AbstractDocumentsPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/AbstractDocumentsPageModContentFactoryImpl.java index 5858a01bfc..64592b7c3d 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/AbstractDocumentsPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/AbstractDocumentsPageModContentFactoryImpl.java @@ -32,6 +32,7 @@ abstract class AbstractDocumentsPageModContentFactoryImpl extends AbstractBasicP /** The Constant NAME. */ public static final String NAME = UserViews.DOCUMENTS_VIEW_NAME; + /** The document menu item factory. */ @Autowired private DocumentMenuItemFactory documentMenuItemFactory; diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentActivityPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentActivityPageModContentFactoryImpl.java index 5c2362ec4e..3ed2b412ab 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentActivityPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentActivityPageModContentFactoryImpl.java @@ -43,9 +43,14 @@ @Component public final class DocumentActivityPageModContentFactoryImpl extends AbstractDocumentPageModContentFactoryImpl { + /** The Constant COLUMN_ORDER. */ private static final String[] COLUMN_ORDER = { "createdDate", "code", "activityName", "orderNumber", "process", "status" }; + + /** The Constant DOCUMENT_ACTIVITIES. */ private static final String DOCUMENT_ACTIVITIES = "Document activities"; + + /** The Constant HIDE_COLUMNS. */ private static final String[] HIDE_COLUMNS = { "hjid" }; /** @@ -64,7 +69,7 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina getDocumentMenuItemFactory().createDocumentMenuBar(menuBar, pageId); - CardInfoRowUtil.createPageHeader(panel, panelContent, + CardInfoRowUtil.createPageHeader(panel, panelContent, DocumentViewConstants.ACTIVITY_TITLE, DocumentViewConstants.ACTIVITY_SUBTITLE, DocumentViewConstants.ACTIVITY_DESC); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentAttachementsPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentAttachementsPageModContentFactoryImpl.java index fa8a27b1a6..c76d08cdce 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentAttachementsPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentAttachementsPageModContentFactoryImpl.java @@ -115,7 +115,7 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina .findByQueryProperty(DocumentStatusContainer.class, DocumentStatusContainer_.document, DocumentData.class, DocumentData_.id, pageId); - CardInfoRowUtil.createPageHeader(panel, panelContent, + CardInfoRowUtil.createPageHeader(panel, panelContent, DocumentViewConstants.ATTACHMENTS_TITLE, DocumentViewConstants.ATTACHMENTS_SUBTITLE, DocumentViewConstants.ATTACHMENTS_DESC); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentDataPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentDataPageModContentFactoryImpl.java index 484940eada..d10dc7d18f 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentDataPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentDataPageModContentFactoryImpl.java @@ -66,7 +66,7 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina getDocumentMenuItemFactory().createDocumentMenuBar(menuBar, pageId); - CardInfoRowUtil.createPageHeader(panel, panelContent, + CardInfoRowUtil.createPageHeader(panel, panelContent, DocumentViewConstants.DATA_TITLE, DocumentViewConstants.DATA_SUBTITLE, DocumentViewConstants.DATA_DESC); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentDecisionPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentDecisionPageModContentFactoryImpl.java index 62258d35a2..e68f4bbf88 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentDecisionPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentDecisionPageModContentFactoryImpl.java @@ -46,6 +46,7 @@ @Component public final class DocumentDecisionPageModContentFactoryImpl extends AbstractDocumentPageModContentFactoryImpl { + /** The Constant AS_LIST. */ private static final List AS_LIST = Arrays.asList("committee", "chamber", "processedIn", "decisionType", "proposalNumber", "designation", "wording", "wording2", "wording3", "wording4"); /** @@ -72,7 +73,7 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina DocumentData.class, DocumentData_.id, pageId); // ...existing code... - CardInfoRowUtil.createPageHeader(panel, panelContent, + CardInfoRowUtil.createPageHeader(panel, panelContent, DocumentViewConstants.DECISION_TITLE, DocumentViewConstants.DECISION_SUBTITLE, DocumentViewConstants.DECISION_DESC); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentDetailsPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentDetailsPageModContentFactoryImpl.java index 75454aacc2..ff070d3ed7 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentDetailsPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentDetailsPageModContentFactoryImpl.java @@ -43,8 +43,13 @@ @Component public final class DocumentDetailsPageModContentFactoryImpl extends AbstractDocumentPageModContentFactoryImpl { + /** The Constant COLUMN_ORDER. */ private static final String[] COLUMN_ORDER = { "code", "detailName", "text" }; + + /** The Constant DOCUMENT_DETAILS2. */ private static final String DOCUMENT_DETAILS2 = "Document details"; + + /** The Constant HIDE_COLUMNS. */ private static final String[] HIDE_COLUMNS = { "hjid" }; /** @@ -70,7 +75,7 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina .findByQueryProperty(DocumentStatusContainer.class, DocumentStatusContainer_.document, DocumentData.class, DocumentData_.id, pageId); - CardInfoRowUtil.createPageHeader(panel, panelContent, + CardInfoRowUtil.createPageHeader(panel, panelContent, DocumentViewConstants.DETAILS_TITLE, DocumentViewConstants.DETAILS_SUBTITLE, DocumentViewConstants.DETAILS_DESC); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentFieldConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentFieldConstants.java index 3421e5cf54..d6cd550201 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentFieldConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentFieldConstants.java @@ -1,27 +1,73 @@ package com.hack23.cia.web.impl.ui.application.views.user.document.pagemode; +/** + * The Interface DocumentFieldConstants. + */ public interface DocumentFieldConstants { + + /** The field title. */ String FIELD_TITLE = "Title:"; + + /** The field subtitle. */ String FIELD_SUBTITLE = "SubTitle:"; + + /** The field organization. */ String FIELD_ORGANIZATION = "Organization (Org):"; + + /** The field doc type. */ String FIELD_DOC_TYPE = "Document Type:"; + + /** The field status. */ String FIELD_STATUS = "Status:"; + + /** The field made public. */ String FIELD_MADE_PUBLIC = "Made Public Date:"; + + /** The field category. */ String FIELD_CATEGORY = "Document Category:"; + + /** The field label. */ String FIELD_LABEL = "Label:"; + + /** The field temp label. */ String FIELD_TEMP_LABEL = "Temp Label:"; + + /** The field hangar id. */ String FIELD_HANGAR_ID = "Hangar ID:"; + + /** The field number value. */ String FIELD_NUMBER_VALUE = "Number Value:"; + /** The tooltip title. */ String TOOLTIP_TITLE = "Main title of the document"; + + /** The tooltip subtitle. */ String TOOLTIP_SUBTITLE = "Subtitle or complementary title"; + + /** The tooltip organization. */ String TOOLTIP_ORGANIZATION = "Originating organization or entity"; + + /** The tooltip doc type. */ String TOOLTIP_DOC_TYPE = "Type of the document"; + + /** The tooltip status. */ String TOOLTIP_STATUS = "Current status of the document"; + + /** The tooltip made public. */ String TOOLTIP_MADE_PUBLIC = "Date when the document was made public"; + + /** The tooltip category. */ String TOOLTIP_CATEGORY = "Category of this document"; + + /** The tooltip label. */ String TOOLTIP_LABEL = "Short identifying label"; + + /** The tooltip temp label. */ String TOOLTIP_TEMP_LABEL = "Temporary label or note"; + + /** The tooltip hangar id. */ String TOOLTIP_HANGAR_ID = "Storage or reference ID"; + + /** The tooltip number value. */ String TOOLTIP_NUMBER_VALUE = "Numeric value associated with the document"; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentGridConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentGridConstants.java index 1ef5d81fed..871b566783 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentGridConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentGridConstants.java @@ -1,15 +1,35 @@ package com.hack23.cia.web.impl.ui.application.views.user.document.pagemode; +/** + * The Interface DocumentGridConstants. + */ public interface DocumentGridConstants { + + /** The grid title. */ String GRID_TITLE = "Document"; + + /** The grid column rm. */ String GRID_COLUMN_RM = "rm"; + + /** The grid column created date. */ String GRID_COLUMN_CREATED_DATE = "createdDate"; + + /** The grid column document name. */ String GRID_COLUMN_DOCUMENT_NAME = "documentName"; + + /** The grid column sub type. */ String GRID_COLUMN_SUB_TYPE = "subType"; + + /** The grid column title. */ String GRID_COLUMN_TITLE = "title"; + + /** The grid column sub title. */ String GRID_COLUMN_SUB_TITLE = "subTitle"; + + /** The grid column status. */ String GRID_COLUMN_STATUS = "status"; + /** The grid hidden columns. */ String[] GRID_HIDDEN_COLUMNS = { "rm", "lang", "noteTitle", "origin", "subType", "note", "subTitle", "status", "label", "id", "hit", "madePublicDate", "databaseSource", "domainOrg", "relatedId", "org", "documentType", "docType", "debateName", "tempLabel", "numberValue", "systemDate", "kallId", diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentOverviewPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentOverviewPageModContentFactoryImpl.java index ca9bbed5e3..333fdff17d 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentOverviewPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentOverviewPageModContentFactoryImpl.java @@ -106,41 +106,41 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina // Display a selection of DocumentElement fields profileLayout.addComponent(CardInfoRowUtil.createInfoRow( - DocumentViewConstants.FIELD_TITLE, - documentElement.getTitle(), + DocumentViewConstants.FIELD_TITLE, + documentElement.getTitle(), VaadinIcons.FILE_TEXT_O, DocumentViewConstants.TOOLTIP_TITLE)); if (!StringUtils.isEmpty(documentElement.getSubTitle())) { profileLayout.addComponent(CardInfoRowUtil.createInfoRow( - DocumentViewConstants.FIELD_SUBTITLE, - documentElement.getSubTitle(), + DocumentViewConstants.FIELD_SUBTITLE, + documentElement.getSubTitle(), VaadinIcons.FILE_TEXT, DocumentViewConstants.TOOLTIP_SUBTITLE)); } profileLayout.addComponent(CardInfoRowUtil.createInfoRow( - DocumentViewConstants.FIELD_ORGANIZATION, + DocumentViewConstants.FIELD_ORGANIZATION, documentElement.getOrg(), - VaadinIcons.INSTITUTION, + VaadinIcons.INSTITUTION, DocumentViewConstants.TOOLTIP_ORGANIZATION)); profileLayout.addComponent(CardInfoRowUtil.createInfoRow( - DocumentViewConstants.FIELD_DOC_TYPE, + DocumentViewConstants.FIELD_DOC_TYPE, documentElement.getDocumentType(), - VaadinIcons.FILE_CODE, + VaadinIcons.FILE_CODE, DocumentViewConstants.TOOLTIP_DOC_TYPE)); profileLayout.addComponent(CardInfoRowUtil.createInfoRow( - DocumentViewConstants.FIELD_STATUS, - documentElement.getStatus(), + DocumentViewConstants.FIELD_STATUS, + documentElement.getStatus(), VaadinIcons.QUESTION_CIRCLE, DocumentViewConstants.TOOLTIP_STATUS)); profileLayout.addComponent(CardInfoRowUtil.createInfoRow( - DocumentViewConstants.FIELD_MADE_PUBLIC, + DocumentViewConstants.FIELD_MADE_PUBLIC, String.valueOf(documentElement.getMadePublicDate()), - VaadinIcons.CALENDAR_USER, + VaadinIcons.CALENDAR_USER, DocumentViewConstants.TOOLTIP_MADE_PUBLIC)); // Right column: Metadata & Status (from DocumentStatusContainer and @@ -153,8 +153,8 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina if (!StringUtils.isEmpty(documentStatusContainer.getDocumentCategory())) { metadataLayout.addComponent(CardInfoRowUtil.createInfoRow( DocumentViewConstants.FIELD_CATEGORY, - documentStatusContainer.getDocumentCategory(), - VaadinIcons.BOOK, + documentStatusContainer.getDocumentCategory(), + VaadinIcons.BOOK, DocumentViewConstants.TOOLTIP_CATEGORY)); } @@ -164,30 +164,30 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina // Choose a few key fields from DocumentData if (!StringUtils.isEmpty(documentData.getLabel())) { metadataLayout.addComponent(CardInfoRowUtil.createInfoRow( - DocumentViewConstants.FIELD_LABEL, - documentData.getLabel(), + DocumentViewConstants.FIELD_LABEL, + documentData.getLabel(), VaadinIcons.TAG, DocumentViewConstants.TOOLTIP_LABEL)); } if (!StringUtils.isEmpty(documentData.getTempLabel())) { metadataLayout.addComponent(CardInfoRowUtil.createInfoRow( - DocumentViewConstants.FIELD_TEMP_LABEL, + DocumentViewConstants.FIELD_TEMP_LABEL, documentData.getTempLabel(), - VaadinIcons.EDIT, + VaadinIcons.EDIT, DocumentViewConstants.TOOLTIP_TEMP_LABEL)); } if (!StringUtils.isEmpty(documentData.getHangarId())) { metadataLayout.addComponent(CardInfoRowUtil.createInfoRow( - DocumentViewConstants.FIELD_HANGAR_ID, + DocumentViewConstants.FIELD_HANGAR_ID, documentData.getHangarId(), - VaadinIcons.CLIPBOARD, + VaadinIcons.CLIPBOARD, DocumentViewConstants.TOOLTIP_HANGAR_ID)); } if (documentData.getNumberValue() != null) { metadataLayout.addComponent(CardInfoRowUtil.createInfoRow( - DocumentViewConstants.FIELD_NUMBER_VALUE, + DocumentViewConstants.FIELD_NUMBER_VALUE, String.valueOf(documentData.getNumberValue()), - VaadinIcons.BAR_CHART, + VaadinIcons.BAR_CHART, DocumentViewConstants.TOOLTIP_NUMBER_VALUE)); } } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentPageTitleConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentPageTitleConstants.java index 2b7e01d3bd..d149c54192 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentPageTitleConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentPageTitleConstants.java @@ -1,57 +1,117 @@ package com.hack23.cia.web.impl.ui.application.views.user.document.pagemode; +/** + * The Interface DocumentPageTitleConstants. + */ public interface DocumentPageTitleConstants { + + /** The activity title. */ // Activity String ACTIVITY_TITLE = "Document Activity"; + + /** The activity subtitle. */ String ACTIVITY_SUBTITLE = "Activity Overview"; + + /** The activity desc. */ String ACTIVITY_DESC = "Analyze document activities, including modifications, approvals, and related events."; + /** The overview title. */ // Overview String OVERVIEW_TITLE = "Document Overview"; + + /** The overview subtitle. */ String OVERVIEW_SUBTITLE = "Document Details"; + + /** The overview desc. */ String OVERVIEW_DESC = "Access and explore official documents and reports."; + + /** The overview section doc info. */ String OVERVIEW_SECTION_DOC_INFO = "Document Information"; + + /** The overview section doc profile. */ String OVERVIEW_SECTION_DOC_PROFILE = "Document Profile"; + + /** The overview section metadata. */ String OVERVIEW_SECTION_METADATA = "Metadata & Status"; + /** The details title. */ // Details String DETAILS_TITLE = "Document Details"; + + /** The details subtitle. */ String DETAILS_SUBTITLE = "Details Overview"; + + /** The details desc. */ String DETAILS_DESC = "Comprehensive details about the document, including key attributes and content."; + /** The references title. */ // References String REFERENCES_TITLE = "Document References"; + + /** The references subtitle. */ String REFERENCES_SUBTITLE = "References Overview"; + + /** The references desc. */ String REFERENCES_DESC = "Analyze and review references within the document, including cross-references."; + /** The person references title. */ // Person References String PERSON_REFERENCES_TITLE = "Document Person References"; + + /** The person references subtitle. */ String PERSON_REFERENCES_SUBTITLE = "Person References"; + + /** The person references desc. */ String PERSON_REFERENCES_DESC = "Identify and explore references to individuals within the document."; + /** The visit history title. */ // Visit History String VISIT_HISTORY_TITLE = "Documents - Page Visit History"; + + /** The visit history subtitle. */ String VISIT_HISTORY_SUBTITLE = "Engagement Insights"; + + /** The visit history desc. */ String VISIT_HISTORY_DESC = "Tracking how interest in policy materials evolves."; + /** The data title. */ // Data String DATA_TITLE = "Document Data"; + + /** The data subtitle. */ String DATA_SUBTITLE = "Data Overview"; + + /** The data desc. */ String DATA_DESC = "Detailed view of the document's core data and metadata."; + /** The decision title. */ // Decision String DECISION_TITLE = "Document Decision"; + + /** The decision subtitle. */ String DECISION_SUBTITLE = "Decision Overview"; + + /** The decision desc. */ String DECISION_DESC = "Review decisions made regarding the document and their implications."; + /** The attachments title. */ // Attachments String ATTACHMENTS_TITLE = "Document Attachments"; + + /** The attachments subtitle. */ String ATTACHMENTS_SUBTITLE = "Attachments Overview"; + + /** The attachments desc. */ String ATTACHMENTS_DESC = "Explore and manage attachments associated with the document."; + /** The documents title. */ // Documents Overview String DOCUMENTS_TITLE = "Documents Overview"; + + /** The documents subtitle. */ String DOCUMENTS_SUBTITLE = "Documents Repository"; + + /** The documents desc. */ String DOCUMENTS_DESC = "Comprehensive repository of Swedish Parliament(Riksdagen) documents."; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentPersonReferencesPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentPersonReferencesPageModContentFactoryImpl.java index 1996692811..168cc6a4bd 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentPersonReferencesPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentPersonReferencesPageModContentFactoryImpl.java @@ -45,10 +45,17 @@ @Component public final class DocumentPersonReferencesPageModContentFactoryImpl extends AbstractDocumentPageModContentFactoryImpl { + /** The Constant COLUMN_ORDER. */ private static final String[] COLUMN_ORDER = { "personReferenceId", "referenceName", "partyShortCode", "orderNumber", "roleDescription" }; + + /** The Constant DOCUMENT_PERSON_REFERENCES. */ private static final String DOCUMENT_PERSON_REFERENCES = "Document person references"; + + /** The Constant HIDE_COLUMNS. */ private static final String[] HIDE_COLUMNS = { "personReferenceId", "hjid" }; + + /** The Constant LISTENER. */ private static final PageItemPropertyClickListener LISTENER = new PageItemPropertyClickListener( UserViews.POLITICIAN_VIEW_NAME, "personReferenceId"); /** diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentReferencesPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentReferencesPageModContentFactoryImpl.java index ce54a67a2a..977bf8f8fb 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentReferencesPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentReferencesPageModContentFactoryImpl.java @@ -43,8 +43,13 @@ @Component public final class DocumentReferencesPageModContentFactoryImpl extends AbstractDocumentPageModContentFactoryImpl { + /** The Constant COLUMN_ORDER. */ private static final String[] COLUMN_ORDER = { "referenceType", "referenceDocumentId", "detail" }; + + /** The Constant DOCUMENT_REFERENCES2. */ private static final String DOCUMENT_REFERENCES2 = "Document references"; + + /** The Constant HIDE_COLUMNS. */ private static final String[] HIDE_COLUMNS = { "hjid" }; /** diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentViewConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentViewConstants.java index 3c29b087e7..01c06ef3a2 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentViewConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentViewConstants.java @@ -3,8 +3,8 @@ /** * Constants for the document view pages. */ -public interface DocumentViewConstants extends - DocumentGridConstants, +public interface DocumentViewConstants extends + DocumentGridConstants, DocumentFieldConstants, DocumentPageTitleConstants, DocumentsOverviewPageModeConstants { diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentsOverviewPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentsOverviewPageModContentFactoryImpl.java index b58b77bea0..736608f03e 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentsOverviewPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentsOverviewPageModContentFactoryImpl.java @@ -124,13 +124,20 @@ private Chart createDocumentStatusChart(final DocumentChartDataManager documentC @Component public final class DocumentsOverviewPageModContentFactoryImpl extends AbstractDocumentsPageModContentFactoryImpl { + /** The Constant COLUMN_ORDER. */ private static final String[] COLUMN_ORDER = { "rm", "createdDate", "documentName", "subType", "title", "subTitle", "status" }; + + /** The Constant DOCUMENT. */ private static final String DOCUMENT = "Document"; + + /** The Constant HIDE_COLUMNS. */ private static final String[] HIDE_COLUMNS = { "rm", "lang", "noteTitle", "origin", "subType", "note", "subTitle", "status", "label", "id", "hit", "madePublicDate", "databaseSource", "domainOrg", "relatedId", "org", "documentType", "docType", "debateName", "tempLabel", "numberValue", "systemDate", "kallId", "documentFormat", "documentUrlText", "documentUrlHtml", "documentStatusUrlXml", "committeeReportUrlXml" }; + + /** The Constant LISTENER. */ private static final PageItemPropertyClickListener LISTENER = new PageItemPropertyClickListener(UserViews.DOCUMENT_VIEW_NAME, "id",true); /** The paging util. */ diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentsOverviewPageModeConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentsOverviewPageModeConstants.java index 9de535cc64..a78472b496 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentsOverviewPageModeConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/DocumentsOverviewPageModeConstants.java @@ -1,16 +1,37 @@ package com.hack23.cia.web.impl.ui.application.views.user.document.pagemode; +/** + * The Interface DocumentsOverviewPageModeConstants. + */ public interface DocumentsOverviewPageModeConstants { + + /** The document type text. */ String DOCUMENT_TYPE_TEXT = "Document Type"; + + /** The document status text. */ String DOCUMENT_STATUS_TEXT = "Document Status"; + + /** The document size text. */ String DOCUMENT_SIZE_TEXT = "Size"; + + /** The document chart colors. */ String[] DOCUMENT_CHART_COLORS = { "#FF9900", "#109618", "#990099", "#3366CC", "#DC3912" }; - + + /** The document activity chart description. */ String DOCUMENT_ACTIVITY_CHART_DESCRIPTION = "Document activity over time"; + + /** The document type chart description. */ String DOCUMENT_TYPE_CHART_DESCRIPTION = "Document type distribution"; + + /** The document status chart description. */ String DOCUMENT_STATUS_CHART_DESCRIPTION = "Document status distribution"; - + + /** The document activity heading. */ String DOCUMENT_ACTIVITY_HEADING = "Document activity"; + + /** The document type distribution heading. */ String DOCUMENT_TYPE_DISTRIBUTION_HEADING = "Document type distribution"; + + /** The document status distribution heading. */ String DOCUMENT_STATUS_DISTRIBUTION_HEADING = "Document status distribution"; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/SearchDocumentPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/SearchDocumentPageModContentFactoryImpl.java index 1fab1389c8..8fa04fd04c 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/SearchDocumentPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/document/pagemode/SearchDocumentPageModContentFactoryImpl.java @@ -49,6 +49,7 @@ @Component public final class SearchDocumentPageModContentFactoryImpl extends AbstractBasicPageModContentFactoryImpl { + /** The Constant AS_LIST. */ private static final List AS_LIST = Collections.singletonList( "searchExpression" ); /** The Constant MAX_RESULT_SIZE. */ @@ -57,8 +58,10 @@ public final class SearchDocumentPageModContentFactoryImpl extends AbstractBasic /** The Constant NAME. */ public static final String NAME = UserViews.SEARCH_DOCUMENT_VIEW_NAME; + /** The Constant SEARCH. */ private static final String SEARCH = "Search"; + /** The document menu item factory. */ @Autowired private DocumentMenuItemFactory documentMenuItemFactory; diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/AbstractMinistryPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/AbstractMinistryPageModContentFactoryImpl.java index b3ef8ea076..82e49edc2f 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/AbstractMinistryPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/AbstractMinistryPageModContentFactoryImpl.java @@ -33,6 +33,7 @@ abstract class AbstractMinistryPageModContentFactoryImpl extends AbstractItemPag /** The Constant NAME. */ public static final String NAME = UserViews.MINISTRY_VIEW_NAME; + /** The ministry menu item factory. */ @Autowired private MinistryMenuItemFactory ministryMenuItemFactory; diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryActionConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryActionConstants.java index c60632fba5..a3247ed9a8 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryActionConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryActionConstants.java @@ -1,13 +1,27 @@ package com.hack23.cia.web.impl.ui.application.views.user.goverment.pagemode; +/** + * The Interface MinistryActionConstants. + */ public interface MinistryActionConstants { + + /** The visit ministry. */ String VISIT_MINISTRY = "VISIT_MINISTRY_VIEW"; + + /** The visit ministry ranking. */ String VISIT_MINISTRY_RANKING = "VISIT_MINISTRY_RANKING_VIEW"; + + /** The visit ministry government body. */ String VISIT_MINISTRY_GOVERNMENT_BODY = "VISIT_MINISTRY_GOVERNMENT_BODY_VIEW"; - + + /** The ministry id. */ // Action Properties String MINISTRY_ID = "nameId"; + + /** The role id. */ String ROLE_ID = "roleId"; + + /** The person id. */ String PERSON_ID = "personId"; } \ No newline at end of file diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryChartConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryChartConstants.java index cb7d5dca60..b0c6d1b34d 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryChartConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryChartConstants.java @@ -1,15 +1,33 @@ package com.hack23.cia.web.impl.ui.application.views.user.goverment.pagemode; +/** + * The Interface MinistryChartConstants. + */ public interface MinistryChartConstants { + + /** The expenditure chart. */ // Chart Headers String EXPENDITURE_CHART = "Ministry Expenditure Chart"; + + /** The income chart. */ String INCOME_CHART = "Ministry Income Chart"; + + /** The headcount chart. */ String HEADCOUNT_CHART = "Ministry Headcount Chart"; + + /** The role ghant. */ String ROLE_GHANT = "Ministry Role Timeline"; - + + /** The expenditure subtitle. */ // Chart Subtitles String EXPENDITURE_SUBTITLE = "Government Bodies Expenditure Analysis"; + + /** The income subtitle. */ String INCOME_SUBTITLE = "Government Bodies Income Analysis"; + + /** The headcount subtitle. */ String HEADCOUNT_SUBTITLE = "Government Bodies Headcount Analysis"; + + /** The role subtitle. */ String ROLE_SUBTITLE = "Role Timeline Analysis"; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryCurrentMembersPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryCurrentMembersPageModContentFactoryImpl.java index b99d824b15..405f8b0c92 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryCurrentMembersPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryCurrentMembersPageModContentFactoryImpl.java @@ -44,6 +44,7 @@ public final class MinistryCurrentMembersPageModContentFactoryImpl extends AbstractMinistryPageModContentFactoryImpl { + /** The Constant LISTENER. */ private static final PageItemPropertyClickListener LISTENER = new PageItemPropertyClickListener( UserViews.POLITICIAN_VIEW_NAME, MinistryMemberConstants.PERSON_ID); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryDescriptionConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryDescriptionConstants.java index 915b2a1fd8..39e5fe5eaa 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryDescriptionConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryDescriptionConstants.java @@ -1,24 +1,60 @@ package com.hack23.cia.web.impl.ui.application.views.user.goverment.pagemode; +/** + * The Interface MinistryDescriptionConstants. + */ public interface MinistryDescriptionConstants { + + /** The overview desc. */ // Page Descriptions String OVERVIEW_DESC = "Detailed view of ministries, their roles, and responsibilities."; + + /** The current members desc. */ String CURRENT_MEMBERS_DESC = "Details the current composition of ministry members."; + + /** The member history desc. */ String MEMBER_HISTORY_DESC = "Details the historical composition of ministry members."; + + /** The document history desc. */ String DOCUMENT_HISTORY_DESC = "Displays the historical progression of documents managed by ministries."; + + /** The document activity desc. */ String DOCUMENT_ACTIVITY_DESC = "Tracks and visualizes the activity associated with ministry documents."; + + /** The expenditure desc. */ String EXPENDITURE_DESC = "Provides detailed expenditure data for government bodies under ministries."; + + /** The headcount desc. */ String HEADCOUNT_DESC = "Provides detailed headcount data for government bodies under ministries."; + + /** The income desc. */ String INCOME_DESC = "Provides detailed income data for government bodies under ministries."; + + /** The visit history desc. */ String VISIT_HISTORY_DESC = "Tracks and visualizes the history of page visits for ministries."; + /** The current ministry members desc. */ // Tooltips/Descriptions String CURRENT_MINISTRY_MEMBERS_DESC = "Number of current ministry members"; + + /** The activity level desc. */ String ACTIVITY_LEVEL_DESC = "Ministry's current activity level"; + + /** The last assignment desc. */ String LAST_ASSIGNMENT_DESC = "Date of most recent assignment"; + + /** The total days served desc. */ String TOTAL_DAYS_SERVED_DESC = "Total days of ministry service"; + + /** The documents last year desc. */ String DOCUMENTS_LAST_YEAR_DESC = "Documents produced in the last year"; + + /** The avg documents member desc. */ String AVG_DOCUMENTS_MEMBER_DESC = "Average documents per ministry member"; + + /** The total propositions desc. */ String TOTAL_PROPOSITIONS_DESC = "Total number of propositions"; + + /** The government bills desc. */ String GOVERNMENT_BILLS_DESC = "Total number of government bills"; } \ No newline at end of file diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryDocumentConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryDocumentConstants.java index 6c7ee37189..3d4a6210e6 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryDocumentConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryDocumentConstants.java @@ -1,14 +1,23 @@ package com.hack23.cia.web.impl.ui.application.views.user.goverment.pagemode; +/** + * The Interface MinistryDocumentConstants. + */ public interface MinistryDocumentConstants { + + /** The documents. */ String DOCUMENTS = "Documents"; + + /** The doc id. */ String DOC_ID = "docId"; - + + /** The column order. */ String[] COLUMN_ORDER = { "id", "docId", "personReferenceId", "roleDescription", - "org", "label", "rm", "madePublicDate", "numberValue", "title", "subTitle", - "tempLabel", "orderNumber", "documentType", "subType", "status", + "org", "label", "rm", "madePublicDate", "numberValue", "title", "subTitle", + "tempLabel", "orderNumber", "documentType", "subType", "status", "partyShortCode", "referenceName" }; + /** The hide columns. */ String[] HIDE_COLUMNS = { "id", "numberValue", "orderNumber", "tempLabel", "personReferenceId", "org", "roleDescription", "label", "subTitle", "docId" }; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryDocumentHistoryPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryDocumentHistoryPageModContentFactoryImpl.java index e34cd5ecf5..cc0aa1a8a7 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryDocumentHistoryPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryDocumentHistoryPageModContentFactoryImpl.java @@ -43,15 +43,7 @@ @Component public final class MinistryDocumentHistoryPageModContentFactoryImpl extends AbstractMinistryPageModContentFactoryImpl { - private static final String[] COLUMN_ORDER = { "id", "docId", "personReferenceId", "roleDescription", - "org", "label", "rm", "madePublicDate", "numberValue", "title", "subTitle", "tempLabel", "orderNumber", - "documentType", "subType", "status", "partyShortCode", "referenceName" }; - - private static final String DOCUMENTS = "Documents"; - - private static final String[] HIDE_COLUMNS = { "id", "numberValue", "orderNumber", "tempLabel", - "personReferenceId", "org", "roleDescription", "label", "subTitle", "docId" }; - + /** The Constant LISTENER. */ private static final PageItemPropertyClickListener LISTENER = new PageItemPropertyClickListener( UserViews.DOCUMENT_VIEW_NAME, MinistryDocumentConstants.DOC_ID, true); @@ -74,7 +66,7 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina getMinistryMenuItemFactory().createMinistryMenuBar(menuBar, pageId); - CardInfoRowUtil.createPageHeader(panel, panelContent, + CardInfoRowUtil.createPageHeader(panel, panelContent, MinistryViewConstants.DOCUMENT_HISTORY_TITLE + " " + viewRiksdagenMinistry.getNameId(), MinistryViewConstants.DOCUMENT_HISTORY_SUBTITLE, MinistryViewConstants.DOCUMENT_HISTORY_DESC); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryFieldConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryFieldConstants.java index 518f2e80e7..0c6fb2dc43 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryFieldConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryFieldConstants.java @@ -1,23 +1,57 @@ package com.hack23.cia.web.impl.ui.application.views.user.goverment.pagemode; +/** + * The Interface MinistryFieldConstants. + */ public interface MinistryFieldConstants { + + /** The ministry id label. */ // Field Labels String MINISTRY_ID_LABEL = "Ministry ID:"; + + /** The status label. */ String STATUS_LABEL = "Status:"; + + /** The current members label. */ String CURRENT_MEMBERS_LABEL = "Current Members:"; + + /** The activity level label. */ String ACTIVITY_LEVEL_LABEL = "Activity Level:"; + + /** The total assignments label. */ String TOTAL_ASSIGNMENTS_LABEL = "Total Assignments:"; + + /** The first assignment label. */ String FIRST_ASSIGNMENT_LABEL = "First Assignment:"; + + /** The last assignment label. */ String LAST_ASSIGNMENT_LABEL = "Last Assignment:"; + + /** The total days label. */ String TOTAL_DAYS_LABEL = "Total Days Served:"; - + + /** The ministry id desc. */ // Field Descriptions String MINISTRY_ID_DESC = "Ministry identifier"; + + /** The status desc. */ String STATUS_DESC = "Current ministry status"; + + /** The members desc. */ String MEMBERS_DESC = "Number of current ministry members"; + + /** The activity desc. */ String ACTIVITY_DESC = "Ministry's current activity level"; + + /** The assignments desc. */ String ASSIGNMENTS_DESC = "Total number of assignments"; + + /** The first date desc. */ String FIRST_DATE_DESC = "Date of first ministry assignment"; + + /** The last date desc. */ String LAST_DATE_DESC = "Date of most recent assignment"; + + /** The days desc. */ String DAYS_DESC = "Total days of ministry service"; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryGovernmentBodiesExpenditureModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryGovernmentBodiesExpenditureModContentFactoryImpl.java index 7095d618cf..92ee086511 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryGovernmentBodiesExpenditureModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryGovernmentBodiesExpenditureModContentFactoryImpl.java @@ -40,6 +40,7 @@ @Component public final class MinistryGovernmentBodiesExpenditureModContentFactoryImpl extends AbstractMinistryPageModContentFactoryImpl { + /** The government body chart data manager. */ @Autowired private GovernmentBodyChartDataManager governmentBodyChartDataManager; diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryGovernmentBodiesHeadcountModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryGovernmentBodiesHeadcountModContentFactoryImpl.java index 04589579bf..a48242d1fa 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryGovernmentBodiesHeadcountModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryGovernmentBodiesHeadcountModContentFactoryImpl.java @@ -40,6 +40,7 @@ @Component public final class MinistryGovernmentBodiesHeadcountModContentFactoryImpl extends AbstractMinistryPageModContentFactoryImpl { + /** The government body chart data manager. */ @Autowired private GovernmentBodyChartDataManager governmentBodyChartDataManager; diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryGovernmentBodiesIncomeModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryGovernmentBodiesIncomeModContentFactoryImpl.java index bdf313a6c9..ac0b87c9be 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryGovernmentBodiesIncomeModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryGovernmentBodiesIncomeModContentFactoryImpl.java @@ -40,6 +40,7 @@ @Component public final class MinistryGovernmentBodiesIncomeModContentFactoryImpl extends AbstractMinistryPageModContentFactoryImpl { + /** The government body chart data manager. */ @Autowired private GovernmentBodyChartDataManager governmentBodyChartDataManager; diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryGridConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryGridConstants.java index b86e07fc54..67b95955bf 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryGridConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryGridConstants.java @@ -1,22 +1,37 @@ package com.hack23.cia.web.impl.ui.application.views.user.goverment.pagemode; +/** + * The Interface MinistryGridConstants. + */ public interface MinistryGridConstants { + + /** The current members. */ // Grid Names String CURRENT_MEMBERS = "Current Members"; + + /** The member history. */ String MEMBER_HISTORY = "Member History"; + + /** The documents. */ String DOCUMENTS = "Documents"; + /** The member column order. */ // Member Column Configuration String[] MEMBER_COLUMN_ORDER = { "roleCode", "roleId", "personId", "firstName", "lastName", "party", "active", "totalDaysServed", "detail", "fromDate", "toDate" }; + + /** The member hide columns. */ String[] MEMBER_HIDE_COLUMNS = { "roleId", "personId", "detail", "active" }; + /** The document column order. */ // Document Column Configuration String[] DOCUMENT_COLUMN_ORDER = { "id", "docId", "personReferenceId", "roleDescription", - "org", "label", "rm", "madePublicDate", "numberValue", "title", "subTitle", - "tempLabel", "orderNumber", "documentType", "subType", "status", + "org", "label", "rm", "madePublicDate", "numberValue", "title", "subTitle", + "tempLabel", "orderNumber", "documentType", "subType", "status", "partyShortCode", "referenceName" }; + + /** The document hide columns. */ String[] DOCUMENT_HIDE_COLUMNS = { "id", "numberValue", "orderNumber", "tempLabel", "personReferenceId", "org", "roleDescription", "label", "subTitle", "docId" }; } \ No newline at end of file diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryIconConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryIconConstants.java index 302936df3d..c5b17cf8f2 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryIconConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryIconConstants.java @@ -2,28 +2,55 @@ import com.vaadin.icons.VaadinIcons; +/** + * The Interface MinistryIconConstants. + */ public interface MinistryIconConstants { + + /** The info icon. */ // Basic Icons VaadinIcons INFO_ICON = VaadinIcons.INFO_CIRCLE; + + /** The flag icon. */ VaadinIcons FLAG_ICON = VaadinIcons.FLAG; + + /** The group icon. */ VaadinIcons GROUP_ICON = VaadinIcons.GROUP; - + + /** The chart icon. */ // Chart Icons VaadinIcons CHART_ICON = VaadinIcons.CHART; + + /** The chart line. */ VaadinIcons CHART_LINE = VaadinIcons.CHART_LINE; - + + /** The calendar icon. */ // Time Icons VaadinIcons CALENDAR_ICON = VaadinIcons.CALENDAR; + + /** The calendar clock. */ VaadinIcons CALENDAR_CLOCK = VaadinIcons.CALENDAR_CLOCK; + + /** The clock icon. */ VaadinIcons CLOCK_ICON = VaadinIcons.CLOCK; - + + /** The file icon. */ // Document Icons VaadinIcons FILE_ICON = VaadinIcons.FILE_TEXT; + + /** The file o icon. */ VaadinIcons FILE_O_ICON = VaadinIcons.FILE_O; + + /** The file presentation. */ VaadinIcons FILE_PRESENTATION = VaadinIcons.FILE_PRESENTATION; + + /** The file text o. */ VaadinIcons FILE_TEXT_O = VaadinIcons.FILE_TEXT_O; - + + /** The tasks icon. */ // Task Icons VaadinIcons TASKS_ICON = VaadinIcons.TASKS; + + /** The task icon. */ VaadinIcons TASK_ICON = VaadinIcons.TASKS; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryLayoutConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryLayoutConstants.java index 6aeff442f7..22f303dd59 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryLayoutConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryLayoutConstants.java @@ -1,10 +1,25 @@ package com.hack23.cia.web.impl.ui.application.views.user.goverment.pagemode; +/** + * The Interface MinistryLayoutConstants. + */ public interface MinistryLayoutConstants { + + /** The width 100 percent. */ String WIDTH_100_PERCENT = "100%"; + + /** The small grid ratio. */ float SMALL_GRID_RATIO = 1.0f; + + /** The large grid ratio. */ float LARGE_GRID_RATIO = 2.0f; + + /** The use margin. */ boolean USE_MARGIN = true; + + /** The use spacing. */ boolean USE_SPACING = true; + + /** The ministry card style. */ String MINISTRY_CARD_STYLE = "ministry-overview-card"; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryMemberConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryMemberConstants.java index f83169ef46..78e47a2656 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryMemberConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryMemberConstants.java @@ -1,17 +1,29 @@ package com.hack23.cia.web.impl.ui.application.views.user.goverment.pagemode; +/** + * The Interface MinistryMemberConstants. + */ public interface MinistryMemberConstants { + + /** The member column order. */ // Grid Configuration String[] MEMBER_COLUMN_ORDER = { "roleCode", "roleId", "personId", "firstName", "lastName", "party", "active", "totalDaysServed", "detail", "fromDate", "toDate" }; - + + /** The member hide columns. */ String[] MEMBER_HIDE_COLUMNS = { "roleId", "personId", "detail" }; - + + /** The member history. */ // Grid Names String MEMBER_HISTORY = "Member History"; + + /** The current members. */ String CURRENT_MEMBERS = "Current Members"; - + + /** The person id. */ // Properties String PERSON_ID = "personId"; + + /** The role id. */ String ROLE_ID = "roleId"; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryMemberHistoryPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryMemberHistoryPageModContentFactoryImpl.java index 7cc42145d4..69d9823bc1 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryMemberHistoryPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryMemberHistoryPageModContentFactoryImpl.java @@ -43,17 +43,10 @@ @Component public final class MinistryMemberHistoryPageModContentFactoryImpl extends AbstractMinistryPageModContentFactoryImpl { - private static final String[] COLUMN_ORDER = { "roleCode", "roleId", "personId", "firstName", - "lastName", "party", "active", "totalDaysServed", "detail", "fromDate", "toDate" }; - - private static final String[] HIDE_COLUMNS = { "roleId", "personId", "detail" }; - + /** The Constant LISTENER. */ private static final PageItemPropertyClickListener LISTENER = new PageItemPropertyClickListener( UserViews.POLITICIAN_VIEW_NAME, MinistryMemberConstants.PERSON_ID); - /** The Constant MEMBER_HISTORY. */ - private static final String MEMBER_HISTORY = "Member History"; - /** * Instantiates a new ministry member history page mod content factory impl. */ diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryOverviewPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryOverviewPageModContentFactoryImpl.java index ed3eb8e699..4b29185215 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryOverviewPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryOverviewPageModContentFactoryImpl.java @@ -139,13 +139,19 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina return panelContent; } + /** + * Creates the profile details. + * + * @param layout the layout + * @param ministry the ministry + */ private void createProfileDetails(VerticalLayout layout, ViewRiksdagenMinistry ministry) { layout.addComponent(CardInfoRowUtil.createInfoRow( MinistryFieldConstants.MINISTRY_ID_LABEL, ministry.getNameId(), MinistryIconConstants.INFO_ICON, MinistryFieldConstants.MINISTRY_ID_DESC)); - + layout.addComponent(CardInfoRowUtil.createInfoRow( MinistryFieldConstants.STATUS_LABEL, ministry.isActive() ? "Active" : "Inactive", @@ -153,14 +159,20 @@ private void createProfileDetails(VerticalLayout layout, ViewRiksdagenMinistry m MinistryFieldConstants.STATUS_DESC)); layout.addComponent(CardInfoRowUtil.createInfoRow(MinistryViewConstants.MINISTRY_CURRENT_MEMBERS_LABEL, - String.valueOf(ministry.getCurrentMemberSize()), VaadinIcons.GROUP, + String.valueOf(ministry.getCurrentMemberSize()), VaadinIcons.GROUP, MinistryDescriptionConstants.CURRENT_MINISTRY_MEMBERS_DESC)); layout.addComponent(CardInfoRowUtil.createInfoRow(MinistryViewConstants.MINISTRY_ACTIVITY_LEVEL_LABEL, - ministry.getActivityLevel(), VaadinIcons.CHART, + ministry.getActivityLevel(), VaadinIcons.CHART, MinistryDescriptionConstants.ACTIVITY_LEVEL_DESC)); } - + + /** + * Creates the service statistics section. + * + * @param layout the layout + * @param ministry the ministry + */ private void createServiceStatisticsSection(VerticalLayout layout, ViewRiksdagenMinistry ministry) { layout.addComponent(CardInfoRowUtil.createInfoRow( MinistryStatisticsConstants.TOTAL_ASSIGNMENTS, @@ -175,13 +187,19 @@ private void createServiceStatisticsSection(VerticalLayout layout, ViewRiksdagen MinistryStatisticsConstants.FIRST_DATE_DESC)); layout.addComponent(CardInfoRowUtil.createInfoRow(MinistryViewConstants.MINISTRY_LAST_ASSIGNMENT_LABEL, - String.valueOf(ministry.getLastAssignmentDate()), VaadinIcons.CALENDAR_CLOCK, + String.valueOf(ministry.getLastAssignmentDate()), VaadinIcons.CALENDAR_CLOCK, MinistryDescriptionConstants.LAST_ASSIGNMENT_DESC)); layout.addComponent(CardInfoRowUtil.createInfoRow(MinistryViewConstants.MINISTRY_TOTAL_DAYS_SERVED_LABEL, - String.valueOf(ministry.getTotalDaysServed()), VaadinIcons.CLOCK, + String.valueOf(ministry.getTotalDaysServed()), VaadinIcons.CLOCK, MinistryDescriptionConstants.TOTAL_DAYS_SERVED_DESC)); } + /** + * Creates the document statistics section. + * + * @param layout the layout + * @param ministry the ministry + */ private void createDocumentStatisticsSection(VerticalLayout layout, ViewRiksdagenMinistry ministry) { layout.addComponent(CardInfoRowUtil.createInfoRow( MinistryStatisticsConstants.TOTAL_DOCUMENTS, @@ -196,16 +214,16 @@ private void createDocumentStatisticsSection(VerticalLayout layout, ViewRiksdage MinistryStatisticsConstants.AVG_DOCS_DESC)); layout.addComponent(CardInfoRowUtil.createInfoRow(MinistryViewConstants.MINISTRY_DOCUMENTS_LAST_YEAR_LABEL, - String.valueOf(ministry.getDocumentsLastYear()), VaadinIcons.FILE_O, + String.valueOf(ministry.getDocumentsLastYear()), VaadinIcons.FILE_O, MinistryDescriptionConstants.DOCUMENTS_LAST_YEAR_DESC)); layout.addComponent(CardInfoRowUtil.createInfoRow(MinistryViewConstants.MINISTRY_AVG_DOCUMENTS_MEMBER_LABEL, String.format(Locale.ENGLISH,"%.1f", ministry.getAvgDocumentsPerMember()), VaadinIcons.CHART_LINE, MinistryDescriptionConstants.AVG_DOCUMENTS_MEMBER_DESC)); layout.addComponent(CardInfoRowUtil.createInfoRow(MinistryViewConstants.MINISTRY_TOTAL_PROPOSITIONS_LABEL, - String.valueOf(ministry.getTotalPropositions()), VaadinIcons.FILE_PRESENTATION, + String.valueOf(ministry.getTotalPropositions()), VaadinIcons.FILE_PRESENTATION, MinistryDescriptionConstants.TOTAL_PROPOSITIONS_DESC)); layout.addComponent(CardInfoRowUtil.createInfoRow(MinistryViewConstants.MINISTRY_GOVERNMENT_BILLS_LABEL, - String.valueOf(ministry.getTotalGovernmentBills()), VaadinIcons.FILE_TEXT_O, + String.valueOf(ministry.getTotalGovernmentBills()), VaadinIcons.FILE_TEXT_O, MinistryDescriptionConstants.GOVERNMENT_BILLS_DESC)); } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryPageModeConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryPageModeConstants.java index 2e97183351..9ac2d6617d 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryPageModeConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryPageModeConstants.java @@ -1,20 +1,44 @@ package com.hack23.cia.web.impl.ui.application.views.user.goverment.pagemode; +/** + * The Interface MinistryPageModeConstants. + */ public interface MinistryPageModeConstants { + + /** The role ghant title. */ // Page Titles String ROLE_GHANT_TITLE = "Ministry Role Ghant"; + + /** The role ghant subtitle. */ String ROLE_GHANT_SUBTITLE = "Role Ghant"; + + /** The role ghant desc. */ String ROLE_GHANT_DESC = "Visual representation of ministry roles over time."; - + + /** The member history title. */ String MEMBER_HISTORY_TITLE = "Ministry Member History"; + + /** The member history subtitle. */ String MEMBER_HISTORY_SUBTITLE = "Member History"; + + /** The member history desc. */ String MEMBER_HISTORY_DESC = "Details the historical composition of ministry members."; - + + /** The expenditure title. */ String EXPENDITURE_TITLE = "Expenditure Analysis"; + + /** The expenditure subtitle. */ String EXPENDITURE_SUBTITLE = "Government Bodies Expenditure Analysis"; + + /** The expenditure desc. */ String EXPENDITURE_DESC = "Provides detailed expenditure data for government bodies under ministries."; - + + /** The income title. */ String INCOME_TITLE = "Government Bodies Income"; + + /** The income subtitle. */ String INCOME_SUBTITLE = "Government Bodies Income"; + + /** The income desc. */ String INCOME_DESC = "Provides detailed income data for government bodies under ministries."; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryPageTitleConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryPageTitleConstants.java index 3bf4f42ac3..ce3b52b79b 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryPageTitleConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryPageTitleConstants.java @@ -1,22 +1,52 @@ package com.hack23.cia.web.impl.ui.application.views.user.goverment.pagemode; +/** + * The Interface MinistryPageTitleConstants. + */ public interface MinistryPageTitleConstants { + + /** The overview title. */ // Page Headers String OVERVIEW_TITLE = "Ministry Overview"; + + /** The current members title. */ String CURRENT_MEMBERS_TITLE = "Ministry Members"; + + /** The member history title. */ String MEMBER_HISTORY_TITLE = "Ministry Member History"; + + /** The document history title. */ String DOCUMENT_HISTORY_TITLE = "Document History"; + + /** The document activity title. */ String DOCUMENT_ACTIVITY_TITLE = "Ministry Documents"; + + /** The government bodies title. */ String GOVERNMENT_BODIES_TITLE = "Government Bodies"; - + + /** The overview subtitle. */ // Page Subtitles String OVERVIEW_SUBTITLE = "Ministry Details"; + + /** The current members subtitle. */ String CURRENT_MEMBERS_SUBTITLE = "Current Members of Ministry"; + + /** The member history subtitle. */ String MEMBER_HISTORY_SUBTITLE = "Member History"; + + /** The document history subtitle. */ String DOCUMENT_HISTORY_SUBTITLE = "Ministry Document History"; + + /** The document activity subtitle. */ String DOCUMENT_ACTIVITY_SUBTITLE = "Document Activity Overview"; + + /** The expenditure subtitle. */ String EXPENDITURE_SUBTITLE = "Government Bodies Expenditure Analysis"; + + /** The headcount subtitle. */ String HEADCOUNT_SUBTITLE = "Government Bodies Headcount"; + + /** The income subtitle. */ String INCOME_SUBTITLE = "Government Bodies Income"; } \ No newline at end of file diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryRankingAllRolesChartsPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryRankingAllRolesChartsPageModContentFactoryImpl.java index 2b56e973bb..30f1d47472 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryRankingAllRolesChartsPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryRankingAllRolesChartsPageModContentFactoryImpl.java @@ -45,6 +45,7 @@ public final class MinistryRankingAllRolesChartsPageModContentFactoryImpl extends AbstractMinistryRankingPageModContentFactoryImpl { + /** The ministry ghant chart manager. */ @Autowired private MinistryGhantChartManager ministryGhantChartManager; diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryRankingDataGridPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryRankingDataGridPageModContentFactoryImpl.java index 5e937ff882..69f8b6143c 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryRankingDataGridPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryRankingDataGridPageModContentFactoryImpl.java @@ -44,6 +44,7 @@ public final class MinistryRankingDataGridPageModContentFactoryImpl extends AbstractMinistryRankingPageModContentFactoryImpl { + /** The Constant COLUMN_ORDER. */ private static final String[] COLUMN_ORDER = { "nameId", "currentMemberSize", diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryRankingGovernmentBodiesPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryRankingGovernmentBodiesPageModContentFactoryImpl.java index dd1140bcd5..75d2ad8b1f 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryRankingGovernmentBodiesPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryRankingGovernmentBodiesPageModContentFactoryImpl.java @@ -39,6 +39,7 @@ @Component public final class MinistryRankingGovernmentBodiesPageModContentFactoryImpl extends AbstractMinistryRankingPageModContentFactoryImpl { + /** The government body chart data manager. */ @Autowired private GovernmentBodyChartDataManager governmentBodyChartDataManager; diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryRankingGovernmentOutcomePageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryRankingGovernmentOutcomePageModContentFactoryImpl.java index 458bc99d70..faa5597961 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryRankingGovernmentOutcomePageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryRankingGovernmentOutcomePageModContentFactoryImpl.java @@ -39,6 +39,7 @@ @Component public final class MinistryRankingGovernmentOutcomePageModContentFactoryImpl extends AbstractMinistryRankingPageModContentFactoryImpl { + /** The government outcome chart data manager. */ @Autowired private GovernmentOutcomeChartDataManager governmentOutcomeChartDataManager; diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryRoleGhantPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryRoleGhantPageModContentFactoryImpl.java index ea29ad59ee..e6bdb40812 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryRoleGhantPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryRoleGhantPageModContentFactoryImpl.java @@ -45,6 +45,7 @@ @Component public final class MinistryRoleGhantPageModContentFactoryImpl extends AbstractMinistryPageModContentFactoryImpl { + /** The ministry ghant chart manager. */ @Autowired private MinistryGhantChartManager ministryGhantChartManager; @@ -65,7 +66,7 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina final ViewRiksdagenMinistry viewRiksdagenMinistry = getItem(parameters); getMinistryMenuItemFactory().createMinistryMenuBar(menuBar, pageId); - CardInfoRowUtil.createPageHeader(panel, panelContent, + CardInfoRowUtil.createPageHeader(panel, panelContent, MinistryViewConstants.ROLE_GHANT_TITLE + " " + viewRiksdagenMinistry.getNameId(), MinistryViewConstants.ROLE_GHANT_SUBTITLE, MinistryViewConstants.ROLE_GHANT_DESC); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistrySectionConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistrySectionConstants.java index 70b7e13b5b..add54d46a3 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistrySectionConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistrySectionConstants.java @@ -1,13 +1,29 @@ package com.hack23.cia.web.impl.ui.application.views.user.goverment.pagemode; +/** + * The Interface MinistrySectionConstants. + */ public interface MinistrySectionConstants { + + /** The ministry profile. */ String MINISTRY_PROFILE = "Ministry Profile"; + + /** The service statistics. */ String SERVICE_STATISTICS = "Service Statistics"; + + /** The document statistics. */ String DOCUMENT_STATISTICS = "Document Statistics"; + + /** The member statistics. */ String MEMBER_STATISTICS = "Member Statistics"; + + /** The government bodies. */ String GOVERNMENT_BODIES = "Government Bodies"; - + + /** The ministry card style. */ // Style Constants String MINISTRY_CARD_STYLE = "ministry-overview-card"; + + /** The full width. */ String FULL_WIDTH = "100%"; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryStatisticsConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryStatisticsConstants.java index 269fb0eb2d..fd65586a6d 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryStatisticsConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryStatisticsConstants.java @@ -1,44 +1,98 @@ package com.hack23.cia.web.impl.ui.application.views.user.goverment.pagemode; +/** + * The Interface MinistryStatisticsConstants. + */ public interface MinistryStatisticsConstants { + + /** The total assignments. */ // Service Statistics Labels String TOTAL_ASSIGNMENTS = "Total Assignments:"; + + /** The first assignment. */ String FIRST_ASSIGNMENT = "First Assignment:"; + + /** The last assignment. */ String LAST_ASSIGNMENT = "Last Assignment:"; + + /** The total days. */ String TOTAL_DAYS = "Total Days Served:"; + + /** The activity level. */ String ACTIVITY_LEVEL = "Activity Level:"; - + + /** The assignments desc. */ // Service Statistics Descriptions String ASSIGNMENTS_DESC = "Total number of ministry assignments"; + + /** The first date desc. */ String FIRST_DATE_DESC = "Date of first ministry assignment"; + + /** The last date desc. */ String LAST_DATE_DESC = "Date of most recent ministry assignment"; + + /** The total days desc. */ String TOTAL_DAYS_DESC = "Total days served in ministry"; + + /** The activity level desc. */ String ACTIVITY_LEVEL_DESC = "Current activity level in ministry"; - + + /** The total documents. */ // Document Statistics Labels String TOTAL_DOCUMENTS = "Total Documents:"; + + /** The documents last year. */ String DOCUMENTS_LAST_YEAR = "Documents Last Year:"; + + /** The avg documents. */ String AVG_DOCUMENTS = "Avg Documents/Member:"; + + /** The total propositions. */ String TOTAL_PROPOSITIONS = "Total Propositions:"; + + /** The government bills. */ String GOVERNMENT_BILLS = "Government Bills:"; - + + /** The total docs desc. */ // Document Statistics Descriptions String TOTAL_DOCS_DESC = "Total number of ministry documents"; + + /** The docs last year desc. */ String DOCS_LAST_YEAR_DESC = "Documents produced in the last year"; + + /** The total documents desc. */ // Alias the constants below to match references in code: String TOTAL_DOCUMENTS_DESC = TOTAL_DOCS_DESC; + + /** The documents last year desc. */ String DOCUMENTS_LAST_YEAR_DESC = DOCS_LAST_YEAR_DESC; + + /** The avg docs desc. */ String AVG_DOCS_DESC = "Average documents per ministry member"; + + /** The total propositions desc. */ String TOTAL_PROPOSITIONS_DESC = "Total number of ministry propositions"; + + /** The government bills desc. */ String GOVERNMENT_BILLS_DESC = "Total number of government bills"; - + + /** The current members. */ // Member Statistics Labels String CURRENT_MEMBERS = "Current Members:"; + + /** The total members. */ String TOTAL_MEMBERS = "Total Members:"; + + /** The active members. */ String ACTIVE_MEMBERS = "Active Members:"; - + + /** The current members desc. */ // Member Statistics Descriptions String CURRENT_MEMBERS_DESC = "Number of current ministry members"; + + /** The total members desc. */ String TOTAL_MEMBERS_DESC = "Total number of ministry members historically"; + + /** The active members desc. */ String ACTIVE_MEMBERS_DESC = "Number of currently active ministry members"; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryStatisticsFields.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryStatisticsFields.java index 79a04d60c2..1e16b53334 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryStatisticsFields.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryStatisticsFields.java @@ -1,17 +1,39 @@ package com.hack23.cia.web.impl.ui.application.views.user.goverment.pagemode; +/** + * The Interface MinistryStatisticsFields. + */ public interface MinistryStatisticsFields { + + /** The total documents. */ // Document Statistics Labels String TOTAL_DOCUMENTS = "Total Documents:"; + + /** The documents last year. */ String DOCUMENTS_LAST_YEAR = "Documents Last Year:"; + + /** The avg documents member. */ String AVG_DOCUMENTS_MEMBER = "Avg Documents/Member:"; + + /** The total propositions. */ String TOTAL_PROPOSITIONS = "Total Propositions:"; + + /** The government bills. */ String GOVERNMENT_BILLS = "Government Bills:"; - + + /** The total documents desc. */ // Document Statistics Descriptions String TOTAL_DOCUMENTS_DESC = "Total number of ministry documents"; + + /** The documents last year desc. */ String DOCUMENTS_LAST_YEAR_DESC = "Documents produced in the last year"; + + /** The avg documents desc. */ String AVG_DOCUMENTS_DESC = "Average documents per ministry member"; + + /** The propositions desc. */ String PROPOSITIONS_DESC = "Total number of propositions"; + + /** The bills desc. */ String BILLS_DESC = "Total number of government bills"; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryViewConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryViewConstants.java index 78e547199c..764058d27d 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryViewConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryViewConstants.java @@ -3,7 +3,7 @@ /** * Constants for the ministry view pages. */ -public interface MinistryViewConstants extends +public interface MinistryViewConstants extends MinistryPageTitleConstants, MinistryDescriptionConstants, MinistryGridConstants, @@ -11,43 +11,91 @@ public interface MinistryViewConstants extends MinistryIconConstants, MinistryLayoutConstants, MinistryStatisticsConstants { - + + /** The overview title. */ // Page Titles String OVERVIEW_TITLE = "Ministry Overview"; + + /** The role ghant title. */ String ROLE_GHANT_TITLE = "Ministry Role Ghant"; + + /** The document history title. */ String DOCUMENT_HISTORY_TITLE = "Document History"; + + /** The current members title. */ String CURRENT_MEMBERS_TITLE = "Ministry Members"; + + /** The expenditure title. */ String EXPENDITURE_TITLE = "Expenditure Analysis"; + + /** The ministry service stats title. */ String MINISTRY_SERVICE_STATS_TITLE = "Service Statistics"; + + /** The ministry document stats title. */ String MINISTRY_DOCUMENT_STATS_TITLE = "Document Statistics"; - + + /** The role ghant subtitle. */ // Subtitles String ROLE_GHANT_SUBTITLE = "Role Timeline"; + + /** The document history subtitle. */ String DOCUMENT_HISTORY_SUBTITLE = "Document History"; + + /** The current members subtitle. */ String CURRENT_MEMBERS_SUBTITLE = "Current Members"; + + /** The expenditure subtitle. */ String EXPENDITURE_SUBTITLE = "Government Bodies Expenditure"; - + + /** The role ghant desc. */ // Descriptions String ROLE_GHANT_DESC = "Visual representation of ministry roles over time."; + + /** The document history desc. */ String DOCUMENT_HISTORY_DESC = "Historical record of ministry documents."; + + /** The current members desc. */ String CURRENT_MEMBERS_DESC = "Current members serving in the ministry."; + + /** The expenditure desc. */ String EXPENDITURE_DESC = "Analysis of ministry expenditures."; - + + /** The visit ministry. */ // Actions String VISIT_MINISTRY = "VISIT_MINISTRY_VIEW"; + + /** The ministry id. */ String MINISTRY_ID = "nameId"; - + + /** The default page size. */ // Grid Config int DEFAULT_PAGE_SIZE = 40; + + /** The hide details. */ boolean HIDE_DETAILS = true; - + + /** The ministry current members label. */ // Labels String MINISTRY_CURRENT_MEMBERS_LABEL = "Current Members:"; + + /** The ministry activity level label. */ String MINISTRY_ACTIVITY_LEVEL_LABEL = "Activity Level:"; + + /** The ministry last assignment label. */ String MINISTRY_LAST_ASSIGNMENT_LABEL = "Last Assignment:"; + + /** The ministry total days served label. */ String MINISTRY_TOTAL_DAYS_SERVED_LABEL = "Total Days Served:"; + + /** The ministry documents last year label. */ String MINISTRY_DOCUMENTS_LAST_YEAR_LABEL = "Documents Last Year:"; + + /** The ministry avg documents member label. */ String MINISTRY_AVG_DOCUMENTS_MEMBER_LABEL = "Avg Documents/Member:"; + + /** The ministry total propositions label. */ String MINISTRY_TOTAL_PROPOSITIONS_LABEL = "Total Propositions:"; + + /** The ministry government bills label. */ String MINISTRY_GOVERNMENT_BILLS_LABEL = "Government Bills:"; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/AbstractGovernmentBodyPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/AbstractGovernmentBodyPageModContentFactoryImpl.java index 29159e44e9..892953df59 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/AbstractGovernmentBodyPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/AbstractGovernmentBodyPageModContentFactoryImpl.java @@ -42,6 +42,7 @@ abstract class AbstractGovernmentBodyPageModContentFactoryImpl extends AbstractI @Autowired private EsvApi esvApi; + /** The government body menu item factory. */ @Autowired private GovernmentBodyMenuItemFactory governmentBodyMenuItemFactory; diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyCardConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyCardConstants.java index 8f1a8bc419..12c98b05ff 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyCardConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyCardConstants.java @@ -1,27 +1,61 @@ package com.hack23.cia.web.impl.ui.application.views.user.govermentbody.pagemode; +/** + * The Interface GovernmentBodyCardConstants. + */ public interface GovernmentBodyCardConstants { + + /** The style government body card. */ String STYLE_GOVERNMENT_BODY_CARD = "government-body-card"; - + + /** The organization profile. */ // Section Headers String ORGANIZATION_PROFILE = "Organization Profile"; + + /** The annual statistics. */ String ANNUAL_STATISTICS = "Annual Statistics"; + + /** The body information. */ String BODY_INFORMATION = "Government Body Information"; - + + /** The name label. */ // Data Labels String NAME_LABEL = "Name:"; + + /** The ministry label. */ String MINISTRY_LABEL = "Ministry:"; + + /** The id label. */ String ID_LABEL = "ID:"; + + /** The org number label. */ String ORG_NUMBER_LABEL = "Org Number:"; + + /** The year label. */ String YEAR_LABEL = "Year:"; + + /** The head count label. */ String HEAD_COUNT_LABEL = "Head Count:"; + + /** The annual head count label. */ String ANNUAL_HEAD_COUNT_LABEL = "Annual Work Head Count:"; - + + /** The name desc. */ // Descriptions String NAME_DESC = "Government body name"; + + /** The ministry desc. */ String MINISTRY_DESC = "Ministry overseeing the body"; + + /** The org number desc. */ String ORG_NUMBER_DESC = "Official organization number"; + + /** The year desc. */ String YEAR_DESC = "The reporting year"; + + /** The head count desc. */ String HEAD_COUNT_DESC = "Total number of staff members"; + + /** The annual head desc. */ String ANNUAL_HEAD_DESC = "Annual average number of full-time equivalents"; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyDescriptionConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyDescriptionConstants.java index af4dcef864..0271d0c2dd 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyDescriptionConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyDescriptionConstants.java @@ -1,31 +1,65 @@ package com.hack23.cia.web.impl.ui.application.views.user.govermentbody.pagemode; +/** + * The Interface GovernmentBodyDescriptionConstants. + */ public interface GovernmentBodyDescriptionConstants { + + /** The overview header. */ // Overview Pages String OVERVIEW_HEADER = "Government Body Overview"; + + /** The overview subtitle. */ String OVERVIEW_SUBTITLE = "Government Details"; + + /** The overview desc. */ String OVERVIEW_DESC = "Explore detailed information about government bodies and their functions."; - + + /** The ranking header. */ // Rankings String RANKING_HEADER = "Government Body Rankings"; + + /** The ranking subtitle. */ String RANKING_SUBTITLE = "Ranking Overview"; + + /** The ranking desc. */ String RANKING_DESC = "Analyze and rank government bodies based on predefined metrics."; - + + /** The expenditure header. */ // Data Pages String EXPENDITURE_HEADER = "Government Body Expenditure"; + + /** The expenditure subtitle. */ String EXPENDITURE_SUBTITLE = "Expenditure Details"; + + /** The expenditure desc. */ String EXPENDITURE_DESC = "Explore detailed expenditure information for government bodies."; - + + /** The income header. */ String INCOME_HEADER = "Government Body Income"; + + /** The income subtitle. */ String INCOME_SUBTITLE = "Income Details"; + + /** The income desc. */ String INCOME_DESC = "Explore detailed income information for government bodies."; - + + /** The headcount header. */ String HEADCOUNT_HEADER = "Government Body Headcount"; + + /** The headcount subtitle. */ String HEADCOUNT_SUBTITLE = "Headcount Details"; + + /** The headcount desc. */ String HEADCOUNT_DESC = "Explore detailed headcount information for government bodies."; - + + /** The visit history header. */ // Visit History String VISIT_HISTORY_HEADER = "Government Body Page Visit History"; + + /** The visit history subtitle. */ String VISIT_HISTORY_SUBTITLE = "Visit History"; + + /** The visit history desc. */ String VISIT_HISTORY_DESC = "Track page visit history and engagement patterns."; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyExpenditurePageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyExpenditurePageModContentFactoryImpl.java index 3d12404333..6017cdd4fa 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyExpenditurePageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyExpenditurePageModContentFactoryImpl.java @@ -69,7 +69,7 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina getGovernmentBodyMenuItemFactory().createGovernmentBodyMenuBar(menuBar, pageId,governmentBodyAnnualSummary.getName()); CardInfoRowUtil.createPageHeader(panel, panelContent, - GovernmentBodyTitleFormatter.formatTitle(governmentBodyAnnualSummary, + GovernmentBodyTitleFormatter.formatTitle(governmentBodyAnnualSummary, GovernmentBodyDescriptionConstants.EXPENDITURE_HEADER), GovernmentBodyDescriptionConstants.EXPENDITURE_SUBTITLE, GovernmentBodyDescriptionConstants.EXPENDITURE_DESC); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyFieldValueFormatter.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyFieldValueFormatter.java index 7b1fd84f26..8029f5231f 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyFieldValueFormatter.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyFieldValueFormatter.java @@ -2,11 +2,27 @@ import java.util.Locale; +/** + * The Class GovernmentBodyFieldValueFormatter. + */ public class GovernmentBodyFieldValueFormatter { + + /** + * Format year. + * + * @param year the year + * @return the string + */ public static String formatYear(int year) { return String.format(Locale.ENGLISH, "%d", year); } - + + /** + * Format count. + * + * @param count the count + * @return the string + */ public static String formatCount(int count) { return String.format(Locale.ENGLISH, "%d", count); } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyGridConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyGridConstants.java index f416228b6e..d2c111bcfd 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyGridConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyGridConstants.java @@ -1,15 +1,22 @@ package com.hack23.cia.web.impl.ui.application.views.user.govermentbody.pagemode; +/** + * The Interface GovernmentBodyGridConstants. + */ public interface GovernmentBodyGridConstants { + + /** The government bodies. */ String GOVERNMENT_BODIES = "Government bodies"; - - String[] COLUMN_ORDER = { + + /** The column order. */ + String[] COLUMN_ORDER = { "name", "ministry", "orgNumber", - "headCount", "annualWorkHeadCount" + "headCount", "annualWorkHeadCount" }; - - String[] HIDE_COLUMNS = { - "vat", "consecutiveNumber", "comment", - "mCode", "govermentBodyId" + + /** The hide columns. */ + String[] HIDE_COLUMNS = { + "vat", "consecutiveNumber", "comment", + "mCode", "govermentBodyId" }; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyHeadcountPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyHeadcountPageModContentFactoryImpl.java index a0c6ce6330..cecc80f88e 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyHeadcountPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyHeadcountPageModContentFactoryImpl.java @@ -67,7 +67,7 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina if (governmentBodyAnnualSummary != null) { getGovernmentBodyMenuItemFactory().createGovernmentBodyMenuBar(menuBar, pageId,governmentBodyAnnualSummary.getName()); CardInfoRowUtil.createPageHeader(panel, panelContent, - GovernmentBodyTitleFormatter.formatTitle(governmentBodyAnnualSummary, + GovernmentBodyTitleFormatter.formatTitle(governmentBodyAnnualSummary, GovernmentBodyDescriptionConstants.HEADCOUNT_HEADER), GovernmentBodyDescriptionConstants.HEADCOUNT_SUBTITLE, GovernmentBodyDescriptionConstants.HEADCOUNT_DESC); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyHeaderConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyHeaderConstants.java index b53dd41a31..89c9393c29 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyHeaderConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyHeaderConstants.java @@ -1,30 +1,78 @@ package com.hack23.cia.web.impl.ui.application.views.user.govermentbody.pagemode; +/** + * The Interface GovernmentBodyHeaderConstants. + */ public interface GovernmentBodyHeaderConstants { + + /** The name field. */ // Field Labels String NAME_FIELD = "Name:"; + + /** The id field. */ String ID_FIELD = "ID:"; + + /** The ministry field. */ String MINISTRY_FIELD = "Ministry:"; + + /** The org number field. */ String ORG_NUMBER_FIELD = "Org Number:"; + + /** The m code field. */ String M_CODE_FIELD = "M Code:"; + + /** The vat field. */ String VAT_FIELD = "VAT:"; + + /** The year field. */ String YEAR_FIELD = "Year:"; + + /** The head count field. */ String HEAD_COUNT_FIELD = "Head Count:"; + + /** The annual headcount field. */ String ANNUAL_HEADCOUNT_FIELD = "Annual Work Head Count:"; + + /** The consecutive number field. */ String CONSECUTIVE_NUMBER_FIELD = "Consecutive Number:"; + + /** The comment field. */ String COMMENT_FIELD = "Comment:"; + /** The name desc. */ // Field Descriptions String NAME_DESC = "Government body name"; + + /** The id desc. */ String ID_DESC = "Unique government body identifier"; + + /** The ministry desc. */ String MINISTRY_DESC = "Ministry overseeing the body"; + + /** The org number desc. */ String ORG_NUMBER_DESC = "Official organization number"; + + /** The m code desc. */ String M_CODE_DESC = "Internal M code identifier"; + + /** The vat desc. */ String VAT_DESC = "VAT number"; + + /** The year desc. */ String YEAR_DESC = "The reporting year"; + + /** The head count desc. */ String HEAD_COUNT_DESC = "Total number of staff members"; + + /** The annual headcount desc. */ String ANNUAL_HEADCOUNT_DESC = "Annual average number of full-time equivalents"; + + /** The annual head desc. */ String ANNUAL_HEAD_DESC = "Annual number of employees in full-time equivalents"; + + /** The consecutive number desc. */ String CONSECUTIVE_NUMBER_DESC = "Internal consecutive reference number"; + + /** The comment desc. */ String COMMENT_DESC = "Additional remarks or notes"; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyIconConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyIconConstants.java index 371bdbce26..db57917a01 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyIconConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyIconConstants.java @@ -2,21 +2,44 @@ import com.vaadin.icons.VaadinIcons; +/** + * The Interface GovernmentBodyIconConstants. + */ public interface GovernmentBodyIconConstants { + + /** The info icon. */ // Basic Icons VaadinIcons INFO_ICON = VaadinIcons.INFO_CIRCLE; + + /** The group icon. */ VaadinIcons GROUP_ICON = VaadinIcons.GROUP; + + /** The user icon. */ VaadinIcons USER_ICON = VaadinIcons.USER; + + /** The user check icon. */ VaadinIcons USER_CHECK_ICON = VaadinIcons.USER_CHECK; - + + /** The money icon. */ // Action Icons VaadinIcons MONEY_ICON = VaadinIcons.MONEY; + + /** The calendar icon. */ VaadinIcons CALENDAR_ICON = VaadinIcons.CALENDAR; + + /** The institution icon. */ VaadinIcons INSTITUTION_ICON = VaadinIcons.INSTITUTION; + + /** The chart icon. */ VaadinIcons CHART_ICON = VaadinIcons.CHART; + + /** The comment icon. */ VaadinIcons COMMENT_ICON = VaadinIcons.COMMENT; - + + /** The check icon. */ // Status Icons VaadinIcons CHECK_ICON = VaadinIcons.CHECK; + + /** The warning icon. */ VaadinIcons WARNING_ICON = VaadinIcons.WARNING; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyIncomePageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyIncomePageModContentFactoryImpl.java index f4f16e25f1..9add54c8bb 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyIncomePageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyIncomePageModContentFactoryImpl.java @@ -68,7 +68,7 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina if (governmentBodyAnnualSummary != null) { getGovernmentBodyMenuItemFactory().createGovernmentBodyMenuBar(menuBar, pageId,governmentBodyAnnualSummary.getName()); CardInfoRowUtil.createPageHeader(panel, panelContent, - GovernmentBodyTitleFormatter.formatTitle(governmentBodyAnnualSummary, + GovernmentBodyTitleFormatter.formatTitle(governmentBodyAnnualSummary, GovernmentBodyDescriptionConstants.INCOME_HEADER), GovernmentBodyDescriptionConstants.INCOME_SUBTITLE, GovernmentBodyDescriptionConstants.INCOME_DESC); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyLayoutConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyLayoutConstants.java index 6dfb05f91e..9fd053c8a3 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyLayoutConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyLayoutConstants.java @@ -1,10 +1,25 @@ package com.hack23.cia.web.impl.ui.application.views.user.govermentbody.pagemode; +/** + * The Interface GovernmentBodyLayoutConstants. + */ public interface GovernmentBodyLayoutConstants { + + /** The width 100 percent. */ String WIDTH_100_PERCENT = "100%"; + + /** The image width. */ int IMAGE_WIDTH = 100; + + /** The small grid ratio. */ float SMALL_GRID_RATIO = 1.0f; + + /** The large grid ratio. */ float LARGE_GRID_RATIO = 2.0f; + + /** The use margin. */ boolean USE_MARGIN = true; + + /** The use spacing. */ boolean USE_SPACING = true; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyOverviewPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyOverviewPageModContentFactoryImpl.java index 8cba2be6d2..46cea73337 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyOverviewPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyOverviewPageModContentFactoryImpl.java @@ -76,6 +76,13 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina return panelContent; } + /** + * Creates the page header. + * + * @param panel the panel + * @param panelContent the panel content + * @param govBody the gov body + */ private void createPageHeader(Panel panel, VerticalLayout panelContent, GovernmentBodyAnnualSummary govBody) { CardInfoRowUtil.createPageHeader(panel, panelContent, GovernmentBodyTitleFormatter.formatTitle(govBody, GovernmentBodyDescriptionConstants.OVERVIEW_HEADER), @@ -83,6 +90,13 @@ private void createPageHeader(Panel panel, VerticalLayout panelContent, Governme GovernmentBodyDescriptionConstants.OVERVIEW_DESC); } + /** + * Creates the main card. + * + * @param panelContent the panel content + * @param govBody the gov body + * @param pageId the page id + */ private void createMainCard(VerticalLayout panelContent, GovernmentBodyAnnualSummary govBody, String pageId) { final Panel cardPanel = createCardPanel(); final VerticalLayout cardContent = createCardContent(cardPanel); @@ -98,6 +112,11 @@ private void createMainCard(VerticalLayout panelContent, GovernmentBodyAnnualSum addOverviewLayout(panelContent, pageId); } + /** + * Creates the card panel. + * + * @return the panel + */ private Panel createCardPanel() { final Panel cardPanel = new Panel(); cardPanel.addStyleName(GovernmentBodyViewConstants.STYLE_GOVERNMENT_BODY_CARD); @@ -107,6 +126,12 @@ private Panel createCardPanel() { return cardPanel; } + /** + * Creates the card content. + * + * @param cardPanel the card panel + * @return the vertical layout + */ private VerticalLayout createCardContent(Panel cardPanel) { final VerticalLayout cardContent = new VerticalLayout(); cardContent.setMargin(GovernmentBodyLayoutConstants.USE_MARGIN); @@ -116,6 +141,11 @@ private VerticalLayout createCardContent(Panel cardPanel) { return cardContent; } + /** + * Creates the attributes layout. + * + * @return the horizontal layout + */ private HorizontalLayout createAttributesLayout() { final HorizontalLayout attributesLayout = new HorizontalLayout(); attributesLayout.setSpacing(GovernmentBodyLayoutConstants.USE_SPACING); @@ -123,14 +153,25 @@ private HorizontalLayout createAttributesLayout() { return attributesLayout; } + /** + * Adds the profile and stats columns. + * + * @param attributesLayout the attributes layout + * @param govBody the gov body + */ private void addProfileAndStatsColumns(HorizontalLayout attributesLayout, GovernmentBodyAnnualSummary govBody) { - final VerticalLayout profileLayout = CardInfoRowUtil.createSectionLayout( - GovernmentBodyViewConstants.ORG_PROFILE); - final VerticalLayout statsLayout = createStatsColumn(govBody); + final VerticalLayout profileLayout = createProfileColumn(govBody); + final VerticalLayout statsLayout = createStatsColumn(govBody); attributesLayout.addComponents(profileLayout, statsLayout); } + /** + * Creates the profile column. + * + * @param govBody the gov body + * @return the vertical layout + */ private VerticalLayout createProfileColumn(GovernmentBodyAnnualSummary govBody) { final VerticalLayout profileLayout = CardInfoRowUtil.createSectionLayout( GovernmentBodyViewConstants.ORG_PROFILE); @@ -139,28 +180,49 @@ private VerticalLayout createProfileColumn(GovernmentBodyAnnualSummary govBody) return profileLayout; } + /** + * Adds the profile details. + * + * @param profileLayout the profile layout + * @param govBody the gov body + */ private void addProfileDetails(VerticalLayout profileLayout, GovernmentBodyAnnualSummary govBody) { profileLayout.addComponents( - createProfileInfoRow(GovernmentBodyHeaderConstants.NAME_FIELD, - govBody.getName(), - GovernmentBodyIconConstants.INFO_ICON, + createProfileInfoRow(GovernmentBodyHeaderConstants.NAME_FIELD, + govBody.getName(), + GovernmentBodyIconConstants.INFO_ICON, GovernmentBodyHeaderConstants.NAME_DESC), - createProfileInfoRow(GovernmentBodyHeaderConstants.ID_FIELD, + createProfileInfoRow(GovernmentBodyHeaderConstants.ID_FIELD, govBody.getGovermentBodyId(), - GovernmentBodyIconConstants.USER_ICON, + GovernmentBodyIconConstants.USER_ICON, GovernmentBodyHeaderConstants.ID_DESC), // ...add other profile fields... - createProfileInfoRow(GovernmentBodyHeaderConstants.VAT_FIELD, + createProfileInfoRow(GovernmentBodyHeaderConstants.VAT_FIELD, govBody.getVat(), - GovernmentBodyIconConstants.MONEY_ICON, + GovernmentBodyIconConstants.MONEY_ICON, GovernmentBodyHeaderConstants.VAT_DESC) ); } + /** + * Creates the profile info row. + * + * @param label the label + * @param value the value + * @param icon the icon + * @param description the description + * @return the com.vaadin.ui. component + */ private com.vaadin.ui.Component createProfileInfoRow(String label, String value, VaadinIcons icon, String description) { return CardInfoRowUtil.createInfoRow(label, value, icon, description); } + /** + * Creates the stats column. + * + * @param govBody the gov body + * @return the vertical layout + */ private VerticalLayout createStatsColumn(GovernmentBodyAnnualSummary govBody) { final VerticalLayout statsLayout = CardInfoRowUtil.createSectionLayout( GovernmentBodyViewConstants.ANNUAL_STATS); @@ -169,6 +231,12 @@ private VerticalLayout createStatsColumn(GovernmentBodyAnnualSummary govBody) { return statsLayout; } + /** + * Adds the stats details. + * + * @param statsLayout the stats layout + * @param govBody the gov body + */ private void addStatsDetails(VerticalLayout statsLayout, GovernmentBodyAnnualSummary govBody) { statsLayout.addComponents( createStatsInfoRow(GovernmentBodyHeaderConstants.YEAR_FIELD, @@ -194,10 +262,25 @@ private void addStatsDetails(VerticalLayout statsLayout, GovernmentBodyAnnualSum } } + /** + * Creates the stats info row. + * + * @param label the label + * @param value the value + * @param icon the icon + * @param description the description + * @return the com.vaadin.ui. component + */ private com.vaadin.ui.Component createStatsInfoRow(String label, String value, VaadinIcons icon, String description) { return CardInfoRowUtil.createInfoRow(label, value, icon, description); } + /** + * Adds the overview layout. + * + * @param panelContent the panel content + * @param pageId the page id + */ private void addOverviewLayout(VerticalLayout panelContent, String pageId) { final VerticalLayout overviewLayout = new VerticalLayout(); overviewLayout.setSizeFull(); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyPageTitleFormatter.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyPageTitleFormatter.java index ec95031e5c..d79e479c34 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyPageTitleFormatter.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyPageTitleFormatter.java @@ -1,11 +1,24 @@ package com.hack23.cia.web.impl.ui.application.views.user.govermentbody.pagemode; import java.util.Locale; + import com.hack23.cia.service.external.esv.api.GovernmentBodyAnnualSummary; +/** + * The Class GovernmentBodyPageTitleFormatter. + */ public class GovernmentBodyPageTitleFormatter { + + /** The Constant TITLE_FORMAT. */ private static final String TITLE_FORMAT = "%s %s"; - + + /** + * Format title. + * + * @param govBody the gov body + * @param pageTitle the page title + * @return the string + */ public static String formatTitle(GovernmentBodyAnnualSummary govBody, String pageTitle) { if (govBody == null) { return pageTitle; diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyRankingDataGridPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyRankingDataGridPageModContentFactoryImpl.java index ccd2895f4a..936678a9a4 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyRankingDataGridPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyRankingDataGridPageModContentFactoryImpl.java @@ -46,6 +46,7 @@ public final class GovernmentBodyRankingDataGridPageModContentFactoryImpl extends AbstractGovernmentBodyRankingPageModContentFactoryImpl { + /** The Constant LISTENER. */ private static final PageItemPropertyClickListener LISTENER = new PageItemPropertyClickListener( UserViews.GOVERNMENT_BODY_VIEW_NAME, GovernmentBodyViewConstants.ORG_NUMBER_PROPERTY); @@ -78,8 +79,8 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina final List list = dataMap.get(GovernmentBodyViewConstants.DEFAULT_YEAR); - getGridFactory().createBasicBeanItemGrid(panelContent, - GovernmentBodyAnnualSummary.class, + getGridFactory().createBasicBeanItemGrid(panelContent, + GovernmentBodyAnnualSummary.class, list, GovernmentBodyViewConstants.GOVERNMENT_BODIES, GovernmentBodyViewConstants.COLUMN_ORDER, diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyRankingOverviewPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyRankingOverviewPageModContentFactoryImpl.java index bdce016e0f..7153cd7409 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyRankingOverviewPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyRankingOverviewPageModContentFactoryImpl.java @@ -56,16 +56,27 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina createHeader(panel, panelContent); createOverviewContent(panelContent); - getPageActionEventHelper().createPageEvent(ViewAction.VISIT_GOVERNMENT_BODY_RANKING_VIEW, + getPageActionEventHelper().createPageEvent(ViewAction.VISIT_GOVERNMENT_BODY_RANKING_VIEW, ApplicationEventGroup.USER, NAME, parameters, pageId); return panelContent; } + /** + * Creates the menu bar. + * + * @param menuBar the menu bar + */ private void createMenuBar(final MenuBar menuBar) { getGovernmentBodyRankingMenuItemFactory().createGovernmentBodyRankingMenuBar(menuBar); } + /** + * Creates the header. + * + * @param panel the panel + * @param panelContent the panel content + */ private void createHeader(final Panel panel, final VerticalLayout panelContent) { CardInfoRowUtil.createPageHeader(panel, panelContent, GovernmentBodyDescriptionConstants.RANKING_HEADER, @@ -73,6 +84,11 @@ private void createHeader(final Panel panel, final VerticalLayout panelContent) GovernmentBodyDescriptionConstants.RANKING_DESC); } + /** + * Creates the overview content. + * + * @param panelContent the panel content + */ private void createOverviewContent(final VerticalLayout panelContent) { getGovernmentBodyRankingMenuItemFactory().createOverviewPage(panelContent); } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyRankingPageVisitHistoryPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyRankingPageVisitHistoryPageModContentFactoryImpl.java index 19dcd423f2..eaba52ae0d 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyRankingPageVisitHistoryPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyRankingPageVisitHistoryPageModContentFactoryImpl.java @@ -70,6 +70,12 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina } + /** + * Creates the header. + * + * @param panel the panel + * @param panelContent the panel content + */ private void createHeader(Panel panel, VerticalLayout panelContent) { CardInfoRowUtil.createPageHeader(panel, panelContent, GovernmentBodyDescriptionConstants.VISIT_HISTORY_HEADER, diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodySectionConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodySectionConstants.java index 792b8308ff..243bff2b72 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodySectionConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodySectionConstants.java @@ -1,15 +1,33 @@ package com.hack23.cia.web.impl.ui.application.views.user.govermentbody.pagemode; +/** + * The Interface GovernmentBodySectionConstants. + */ public interface GovernmentBodySectionConstants { + + /** The body info. */ // Section Headers String BODY_INFO = "Government Body Information"; + + /** The org profile. */ String ORG_PROFILE = "Organization Profile"; + + /** The annual stats. */ String ANNUAL_STATS = "Annual Statistics"; + + /** The performance. */ String PERFORMANCE = "Performance Metrics"; + + /** The expenditure. */ String EXPENDITURE = "Expenditure Details"; + + /** The income. */ String INCOME = "Income Details"; + + /** The headcount. */ String HEADCOUNT = "Headcount Overview"; + /** The style government body card. */ // Styles String STYLE_GOVERNMENT_BODY_CARD = "government-body-card"; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodySectionHeaderConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodySectionHeaderConstants.java index c4b8d10726..ee3b717d8c 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodySectionHeaderConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodySectionHeaderConstants.java @@ -1,7 +1,16 @@ package com.hack23.cia.web.impl.ui.application.views.user.govermentbody.pagemode; +/** + * The Interface GovernmentBodySectionHeaderConstants. + */ public interface GovernmentBodySectionHeaderConstants { + + /** The body info. */ String BODY_INFO = "Government Body Information"; + + /** The org profile. */ String ORG_PROFILE = "Organization Profile"; + + /** The annual stats. */ String ANNUAL_STATS = "Annual Statistics"; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyTitleFormatter.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyTitleFormatter.java index 1cb2cc6c45..61c49d370a 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyTitleFormatter.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyTitleFormatter.java @@ -1,9 +1,21 @@ package com.hack23.cia.web.impl.ui.application.views.user.govermentbody.pagemode; import java.util.Locale; + import com.hack23.cia.service.external.esv.api.GovernmentBodyAnnualSummary; +/** + * The Class GovernmentBodyTitleFormatter. + */ public class GovernmentBodyTitleFormatter { + + /** + * Format title. + * + * @param govBody the gov body + * @param pageTitle the page title + * @return the string + */ public static String formatTitle(GovernmentBodyAnnualSummary govBody, String pageTitle) { if (govBody == null) { return pageTitle; diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyViewConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyViewConstants.java index 9e1d0a2a07..e33864ec84 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyViewConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/govermentbody/pagemode/GovernmentBodyViewConstants.java @@ -11,16 +11,27 @@ public interface GovernmentBodyViewConstants extends GovernmentBodySectionConstants, GovernmentBodyIconConstants { + /** The government body view. */ // View Names String GOVERNMENT_BODY_VIEW = "Government Body View"; + + /** The government body ranking view. */ String GOVERNMENT_BODY_RANKING_VIEW = "Government Body Rankings"; - + + /** The org number property. */ // Grid Properties String ORG_NUMBER_PROPERTY = "orgNumber"; + + /** The government bodies. */ String GOVERNMENT_BODIES = "Government bodies"; + + /** The default year. */ int DEFAULT_YEAR = 2024; - + + /** The visit government body. */ // View Actions String VISIT_GOVERNMENT_BODY = "VISIT_GOVERNMENT_BODY"; + + /** The visit government ranking. */ String VISIT_GOVERNMENT_RANKING = "VISIT_GOVERNMENT_RANKING"; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/home/pagemode/UserHomeApplicationEventsPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/home/pagemode/UserHomeApplicationEventsPageModContentFactoryImpl.java index ab69558416..35b6affa1d 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/home/pagemode/UserHomeApplicationEventsPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/home/pagemode/UserHomeApplicationEventsPageModContentFactoryImpl.java @@ -47,15 +47,19 @@ public final class UserHomeApplicationEventsPageModContentFactoryImpl extends AbstractUserHomePageModContentFactoryImpl { + /** The Constant APPLICATION_ACTION_EVENT. */ private static final String APPLICATION_ACTION_EVENT = "ApplicationActionEvent"; + /** The Constant COLUMN_ORDER. */ private static final String[] COLUMN_ORDER = { "hjid", "createdDate", "eventGroup", "applicationOperation", "actionName", "page", "pageMode", "elementId", "applicationMessage", "errorMessage", "modelObjectVersion" }; + /** The Constant HIDE_COLUMNS. */ private static final String[] HIDE_COLUMNS = { "hjid", "userId", "sessionId", "modelObjectId", "modelObjectVersion" }; + /** The Constant LISTENER. */ private static final PageItemPropertyClickListener LISTENER = new PageItemPropertyClickListener( AdminViews.ADMIN_APPLICATIONS_EVENTS_VIEW_NAME, "hjid"); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/home/pagemode/UserHomeApplicationSessionsPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/home/pagemode/UserHomeApplicationSessionsPageModContentFactoryImpl.java index 8faa341b21..9b5dd78be2 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/home/pagemode/UserHomeApplicationSessionsPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/home/pagemode/UserHomeApplicationSessionsPageModContentFactoryImpl.java @@ -48,17 +48,22 @@ public final class UserHomeApplicationSessionsPageModContentFactoryImpl extends AbstractUserHomePageModContentFactoryImpl { + /** The Constant APPLICATION_SESSION. */ private static final String APPLICATION_SESSION = "ApplicationSession"; + /** The Constant COLLECTION_PROPERTY_CONVERTERS. */ private static final ListPropertyConverter[] COLLECTION_PROPERTY_CONVERTERS = { new ListPropertyConverter("page", "events", "actionName") }; + /** The Constant COLUMN_ORDER. */ private static final String[] COLUMN_ORDER = { "hjid", "createdDate", "operatingSystem", "ipInformation", "events", "userAgentInformation" }; + /** The Constant HIDE_COLUMNS. */ private static final String[] HIDE_COLUMNS = { "hjid", "modelObjectId", "modelObjectVersion", "sessionId", "sessionType", "userId", "locale" }; + /** The Constant LISTENER. */ private static final PageItemPropertyClickListener LISTENER = new PageItemPropertyClickListener( AdminViews.ADMIN_APPLICATIONS_SESSION_VIEW_NAME, "hjid"); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/home/pagemode/UserHomeSecuritySettingsPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/home/pagemode/UserHomeSecuritySettingsPageModContentFactoryImpl.java index 50f29a4116..ef62f7eb9f 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/home/pagemode/UserHomeSecuritySettingsPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/home/pagemode/UserHomeSecuritySettingsPageModContentFactoryImpl.java @@ -198,6 +198,11 @@ private VerticalLayout createEnableGoogleAuthButton() { return formLayout; } + /** + * Creates the delete account button. + * + * @return the vertical layout + */ private VerticalLayout createDeleteAccountButton() { final VerticalLayout formLayout = new VerticalLayout(); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/parliament/pagemode/ParliamentChartConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/parliament/pagemode/ParliamentChartConstants.java index 176faf581d..3076237df2 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/parliament/pagemode/ParliamentChartConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/parliament/pagemode/ParliamentChartConstants.java @@ -1,8 +1,17 @@ package com.hack23.cia.web.impl.ui.application.views.user.parliament.pagemode; +/** + * The Interface ParliamentChartConstants. + */ public interface ParliamentChartConstants { + + /** The chart prefix. */ // Chart configuration constants String CHART_PREFIX = "Chart: "; + + /** The default year. */ String DEFAULT_YEAR = "2023/24"; + + /** The year selector label. */ String YEAR_SELECTOR_LABEL = "Select year"; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/parliament/pagemode/ParliamentPageTitleConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/parliament/pagemode/ParliamentPageTitleConstants.java index 4864046ec2..ab5fe3552f 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/parliament/pagemode/ParliamentPageTitleConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/parliament/pagemode/ParliamentPageTitleConstants.java @@ -1,47 +1,101 @@ package com.hack23.cia.web.impl.ui.application.views.user.parliament.pagemode; +/** + * The Interface ParliamentPageTitleConstants. + */ public interface ParliamentPageTitleConstants { + + /** The overview title. */ // Pages String OVERVIEW_TITLE = "Parliament Overview"; + + /** The overview subtitle. */ String OVERVIEW_SUBTITLE = "Parliament Details"; + + /** The overview desc. */ String OVERVIEW_DESC = "Insights into parliamentary structure, members, and activities."; + /** The party winner title. */ // Charts String PARTY_WINNER_TITLE = "Parliament - Party Winner Charts"; + + /** The party winner subtitle. */ String PARTY_WINNER_SUBTITLE = "Prevailing Forces"; + + /** The party winner desc. */ String PARTY_WINNER_DESC = "Identifying parties prevailing in legislative contests."; + /** The party gender title. */ String PARTY_GENDER_TITLE = "Parliament - Party Gender Analysis"; + + /** The party gender subtitle. */ String PARTY_GENDER_SUBTITLE = "Representation Patterns"; + + /** The party gender desc. */ String PARTY_GENDER_DESC = "Assessing representation and inclusive leadership patterns."; + /** The party age title. */ String PARTY_AGE_TITLE = "Parliament - Party Age Dynamics"; + + /** The party age subtitle. */ String PARTY_AGE_SUBTITLE = "Generational Shifts"; + + /** The party age desc. */ String PARTY_AGE_DESC = "Examining generational shifts influencing governance."; + /** The doc activity title. */ String DOC_ACTIVITY_TITLE = "Parliament - Document Activity by Type"; + + /** The doc activity subtitle. */ String DOC_ACTIVITY_SUBTITLE = "Information Dynamics"; + + /** The doc activity desc. */ String DOC_ACTIVITY_DESC = "Uncovering how information shapes legislative agendas."; + /** The decision activity title. */ String DECISION_ACTIVITY_TITLE = "Parliament - Decision Activity by Type"; + + /** The decision activity subtitle. */ String DECISION_ACTIVITY_SUBTITLE = "Policy Priorities"; + + /** The decision activity desc. */ String DECISION_ACTIVITY_DESC = "Comparing legislative outputs to reveal policy priorities."; + /** The rule violations title. */ String RULE_VIOLATIONS_TITLE = "Parliament - Rule Violations"; + + /** The rule violations subtitle. */ String RULE_VIOLATIONS_SUBTITLE = "Procedural Oversight"; + + /** The rule violations desc. */ String RULE_VIOLATIONS_DESC = "Highlighting procedural breaches and oversight challenges."; + /** The risk assessment title. */ String RISK_ASSESSMENT_TITLE = "Parliament - Risk Assessment"; + + /** The risk assessment subtitle. */ String RISK_ASSESSMENT_SUBTITLE = "Identifying Vulnerabilities"; + + /** The risk assessment desc. */ String RISK_ASSESSMENT_DESC = "Identifying institutional vulnerabilities and threats."; + /** The decision flow title. */ // Decision Flow String DECISION_FLOW_TITLE = "Parliament Decision Flow"; + + /** The decision flow subtitle. */ String DECISION_FLOW_SUBTITLE = "Legislative Pipelines"; + + /** The decision flow desc. */ String DECISION_FLOW_DESC = "Mapping legislative pipelines shaping national policies"; + /** The visit history title. */ // Visit History String VISIT_HISTORY_TITLE = "Parliament - Page Visit History"; + + /** The visit history subtitle. */ String VISIT_HISTORY_SUBTITLE = "Engagement Over Time"; + + /** The visit history desc. */ String VISIT_HISTORY_DESC = "Tracing shifts in engagement with legislative proceedings."; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/parliament/pagemode/ParliamentRiskConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/parliament/pagemode/ParliamentRiskConstants.java index 8a3b1b2731..9bb4477f07 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/parliament/pagemode/ParliamentRiskConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/parliament/pagemode/ParliamentRiskConstants.java @@ -1,11 +1,25 @@ package com.hack23.cia.web.impl.ui.application.views.user.parliament.pagemode; +/** + * The Interface ParliamentRiskConstants. + */ public interface ParliamentRiskConstants { + + /** The risk grid name. */ String RISK_GRID_NAME = "Risk"; + + /** The risk column order. */ String[] RISK_COLUMN_ORDER = { "name", "status", "resourceType", "ruleName", "ruleGroup", "ruleDescription", "positive" }; + + /** The risk hidden columns. */ String[] RISK_HIDDEN_COLUMNS = { "referenceId" }; + /** The compliance grid name. */ String COMPLIANCE_GRID_NAME = "Risk"; + + /** The compliance column order. */ String[] COMPLIANCE_COLUMN_ORDER = { "name", "resourceType", "numberRuleViolations", "ruleSummary" }; + + /** The compliance hidden columns. */ String[] COMPLIANCE_HIDDEN_COLUMNS = { "id", "ruleViolations" }; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/parliament/pagemode/ParliamentRiskPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/parliament/pagemode/ParliamentRiskPageModContentFactoryImpl.java index 9d6f222f40..4763f31c24 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/parliament/pagemode/ParliamentRiskPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/parliament/pagemode/ParliamentRiskPageModContentFactoryImpl.java @@ -55,6 +55,7 @@ @Component public final class ParliamentRiskPageModContentFactoryImpl extends AbstractParliamentPageModContentFactoryImpl { + /** The Constant CLICK_LISTENER. */ private static final ComplianceCheckPageItemRendererClickListener CLICK_LISTENER = new ComplianceCheckPageItemRendererClickListener(); /** * Instantiates a new parliament risk page mod content factory impl. diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/parliament/pagemode/ParliamentViewConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/parliament/pagemode/ParliamentViewConstants.java index c6fc895e35..17a8dc3e40 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/parliament/pagemode/ParliamentViewConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/parliament/pagemode/ParliamentViewConstants.java @@ -3,7 +3,7 @@ /** * Constants for the parliament view pages. */ -public interface ParliamentViewConstants extends +public interface ParliamentViewConstants extends ParliamentPageTitleConstants, ParliamentChartConstants, ParliamentRiskConstants { diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyCoalitionsAgainstAnnualSummaryChartPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyCoalitionsAgainstAnnualSummaryChartPageModContentFactoryImpl.java index 8bd9e74e45..1cb09894fb 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyCoalitionsAgainstAnnualSummaryChartPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyCoalitionsAgainstAnnualSummaryChartPageModContentFactoryImpl.java @@ -40,6 +40,7 @@ public final class PartyCoalitionsAgainstAnnualSummaryChartPageModContentFactoryImpl extends AbstractPartyPageModContentFactoryImpl { + /** The chart data manager. */ @Autowired private PartyCoalationChartDataManager chartDataManager; diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyCommitteeBallotDecisionSummaryPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyCommitteeBallotDecisionSummaryPageModContentFactoryImpl.java index 99b029aa1e..1d76c13599 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyCommitteeBallotDecisionSummaryPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyCommitteeBallotDecisionSummaryPageModContentFactoryImpl.java @@ -47,8 +47,10 @@ public final class PartyCommitteeBallotDecisionSummaryPageModContentFactoryImpl extends AbstractPartyPageModContentFactoryImpl { + /** The Constant BALLOT_ID. */ private static final String BALLOT_ID = "ballotId"; + /** The Constant COLUMN_ORDER. */ private static final String[] COLUMN_ORDER = { "voteDate", "rm", "org", "embeddedId.id", "embeddedId.party", "committeeReport", "title", "subTitle", "winner", "partyApproved", "againstProposalParties", "embeddedId.concern", "embeddedId.issue", "endNumber", "createdDate", @@ -62,15 +64,18 @@ public final class PartyCommitteeBallotDecisionSummaryPageModContentFactoryImpl /** The Constant COMMITTEE_BALLOT_DECISION_PARTY_SUMMARY. */ private static final String COMMITTEE_BALLOT_DECISION_PARTY_SUMMARY = "Committee Ballot Decision Party Summary"; + /** The Constant HIDE_COLUMNS. */ private static final String[] HIDE_COLUMNS = { "embeddedId", BALLOT_ID, "decisionType", "ballotType", "againstProposalNumber", "embeddedId.id", "embeddedId.party", "createdDate", "publicDate", "label", "endNumber", "org", "partyPercentageYes", "partyPercentageNo", "partyPercentageAbsent", "partyPercentageAbstain", "partyPercentageMale", "partyAvgBornYear", "avgBornYear", "percentageYes", "percentageNo", "percentageAbsent", "percentageAbstain", "percentageMale", "approved", "noWinner" }; + /** The Constant LISTENER. */ private static final PageItemPropertyClickListener LISTENER = new PageItemPropertyClickListener( UserViews.BALLOT_VIEW_NAME, BALLOT_ID); + /** The Constant NESTED_PROPERTIES. */ private static final String[] NESTED_PROPERTIES = { "embeddedId.id", "embeddedId.concern", "embeddedId.issue", "embeddedId.party" }; diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyCommitteeRolesPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyCommitteeRolesPageModContentFactoryImpl.java index 9b4f2a7c65..ac4ebc989b 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyCommitteeRolesPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyCommitteeRolesPageModContentFactoryImpl.java @@ -42,11 +42,16 @@ @Component public final class PartyCommitteeRolesPageModContentFactoryImpl extends AbstractPartyPageModContentFactoryImpl { + /** The Constant COLUMN_ORDER. */ private static final String[] COLUMN_ORDER = { "roleId", "personId", "firstName", "lastName", "detail", "active", "roleCode", "fromDate", "toDate", "totalDaysServed" }; /** The Constant COMMITTEE_ROLES. */ private static final String COMMITTEE_ROLES = "CommitteeRoles"; + + /** The Constant HIDE_COLUMNS. */ private static final String[] HIDE_COLUMNS = { "roleId", "personId", "party" }; + + /** The Constant LISTENER. */ private static final PageItemPropertyClickListener LISTENER = new PageItemPropertyClickListener( UserViews.POLITICIAN_VIEW_NAME, "personId"); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyCurrentLeadersPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyCurrentLeadersPageModContentFactoryImpl.java index 6727123590..04a86f795b 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyCurrentLeadersPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyCurrentLeadersPageModContentFactoryImpl.java @@ -42,11 +42,16 @@ @Component public final class PartyCurrentLeadersPageModContentFactoryImpl extends AbstractPartyPageModContentFactoryImpl { + /** The Constant COLUMN_ORDER. */ private static final String[] COLUMN_ORDER = { "roleCode", "roleId", "personId", "firstName", "lastName", "party", "totalDaysServed", "active", "detail", "fromDate", "toDate" }; /** The Constant CURRENT_LEADERS. */ private static final String CURRENT_LEADERS = "Current Leaders"; + + /** The Constant HIDE_COLUMNS. */ private static final String[] HIDE_COLUMNS = { "roleId", "personId", "detail", "active", "party" }; + + /** The Constant LISTENER. */ private static final PageItemPropertyClickListener LISTENER = new PageItemPropertyClickListener( UserViews.POLITICIAN_VIEW_NAME, "personId"); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyCurrentMembersPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyCurrentMembersPageModContentFactoryImpl.java index 50b4380318..ef71eed1e2 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyCurrentMembersPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyCurrentMembersPageModContentFactoryImpl.java @@ -42,6 +42,7 @@ @Component public final class PartyCurrentMembersPageModContentFactoryImpl extends AbstractPartyPageModContentFactoryImpl { + /** The Constant COLUMN_ORDER. */ private static final String[] COLUMN_ORDER = { "personId", "firstName", "lastName", "party", "bornYear", "totalDaysServed", "currentAssignments", "totalAssignments", "firstAssignmentDate", "lastAssignmentDate", "totalDaysServedParliament", "totalDaysServedCommittee", "totalDaysServedGovernment", @@ -56,10 +57,15 @@ public final class PartyCurrentMembersPageModContentFactoryImpl extends Abstract "currentPartyAssignments", "currentMinistryAssignments", "currentCommitteeAssignments", "currentSpeakerAssignments", "gender" }; + /** The Constant HIDE_COLUMNS. */ private static final String[] HIDE_COLUMNS = { "personId", "active", "activeEu", "party", "activeGovernment", "activeCommittee", "activeParliament", "activeParty", "activeSpeaker", "bornYear" }; + + /** The Constant LISTENER. */ private static final PageItemPropertyClickListener LISTENER = new PageItemPropertyClickListener( UserViews.POLITICIAN_VIEW_NAME, "personId"); + + /** The Constant POLITICIANS. */ private static final String POLITICIANS = "Politicians"; /** diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyDocumentHistoryPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyDocumentHistoryPageModContentFactoryImpl.java index e853d81d23..0d6e3a0ff4 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyDocumentHistoryPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyDocumentHistoryPageModContentFactoryImpl.java @@ -42,13 +42,20 @@ @Component public final class PartyDocumentHistoryPageModContentFactoryImpl extends AbstractPartyPageModContentFactoryImpl { + /** The Constant COLUMN_ORDER. */ private static final String[] COLUMN_ORDER = { "rm", "madePublicDate", "title", "subTitle", "id", "docId", "referenceName", "partyShortCode", "personReferenceId", "roleDescription", "documentType", "subType", "org", "label", "numberValue", "status", "tempLabel", "orderNumber" }; + + /** The Constant HIDE_COLUMNS. */ private static final String[] HIDE_COLUMNS = { "id", "partyShortCode", "personReferenceId", "numberValue", "orderNumber", "tempLabel", "label", "docId", "roleDescription" }; + + /** The Constant LISTENER. */ private static final PageItemPropertyClickListener LISTENER = new PageItemPropertyClickListener( UserViews.DOCUMENT_VIEW_NAME, "docId", true); + + /** The Constant MEMBER_DOCUMENT_HISTORY. */ private static final String MEMBER_DOCUMENT_HISTORY = "Member Document history"; /** diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyGovernmentRolesPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyGovernmentRolesPageModContentFactoryImpl.java index 49af0eb51b..1c62a93f9f 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyGovernmentRolesPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyGovernmentRolesPageModContentFactoryImpl.java @@ -42,11 +42,16 @@ @Component public final class PartyGovernmentRolesPageModContentFactoryImpl extends AbstractPartyPageModContentFactoryImpl { + /** The Constant PERSON_ID. */ private static final String PERSON_ID = "personId"; + + /** The Constant COLUMN_ORDER. */ private static final String[] COLUMN_ORDER = { "roleId", PERSON_ID, "firstName", "lastName", "active", "detail", "roleCode", "fromDate", "toDate", "totalDaysServed" }; /** The Constant GOVERNMENT_ROLES. */ private static final String GOVERNMENT_ROLES = "Government Roles"; + + /** The Constant HIDE_COLUMNS. */ private static final String[] HIDE_COLUMNS = { "roleId", PERSON_ID, "party" }; /** diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyLeaderHistoryPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyLeaderHistoryPageModContentFactoryImpl.java index f3f22f088d..3f1651461f 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyLeaderHistoryPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyLeaderHistoryPageModContentFactoryImpl.java @@ -42,10 +42,17 @@ @Component public final class PartyLeaderHistoryPageModContentFactoryImpl extends AbstractPartyPageModContentFactoryImpl { + /** The Constant COLUMN_ORDER. */ private static final String[] COLUMN_ORDER = { "roleId", "roleCode", "personId", "firstName", "lastName", "party", "totalDaysServed", "active", "detail", "fromDate", "toDate" }; + + /** The Constant HIDE_COLUMNS. */ private static final String[] HIDE_COLUMNS = { "roleId", "personId", "party", "detail" }; + + /** The Constant LEADER_HISTORY2. */ private static final String LEADER_HISTORY2 = "Leader History"; + + /** The Constant LISTENER. */ private static final PageItemPropertyClickListener LISTENER = new PageItemPropertyClickListener( UserViews.POLITICIAN_VIEW_NAME, "personId"); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyRoleGhantPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyRoleGhantPageModContentFactoryImpl.java index 536f656a24..58448254fc 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyRoleGhantPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyRoleGhantPageModContentFactoryImpl.java @@ -47,6 +47,7 @@ public final class PartyRoleGhantPageModContentFactoryImpl extends AbstractParty /** The Constant ROLE_GHANT. */ private static final String ROLE_GHANT = "Role chart"; + /** The party ghant chart manager. */ @Autowired private PartyGhantChartManager partyGhantChartManager; diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyVoteHistoryPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyVoteHistoryPageModContentFactoryImpl.java index 4af6ca9dda..4497eac886 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyVoteHistoryPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyVoteHistoryPageModContentFactoryImpl.java @@ -42,24 +42,30 @@ @Component public final class PartyVoteHistoryPageModContentFactoryImpl extends AbstractPartyPageModContentFactoryImpl { + /** The Constant BALLOTS. */ private static final String BALLOTS = "Ballots"; + /** The Constant EMBEDDED_ID_BALLOT_ID. */ private static final String EMBEDDED_ID_BALLOT_ID = "embeddedId.ballotId"; + /** The Constant COLUMN_ORDER. */ private static final String[] COLUMN_ORDER = { "embeddedId.party", "voteDate", "rm", "label", "embeddedId.concern", "embeddedId.issue", "approved", "partyApproved", "totalVotes", "partyTotalVotes", "yesVotes", "partyYesVotes", "noVotes", "partyNoVotes", "partyAbstainVotes", "abstainVotes", "partyAbsentVotes", "absentVotes", "partyAvgBornYear", "avgBornYear", "partyPercentageMale", "percentageMale", "ballotType", EMBEDDED_ID_BALLOT_ID }; + /** The Constant HIDE_COLUMNS. */ private static final String[] HIDE_COLUMNS = { "embeddedId", "partyNoWinner", "partyPercentageYes", "partyPercentageNo", "partyPercentageAbsent", "partyPercentageAbstain", "percentageYes", "percentageNo", "percentageAbsent", "percentageAbstain", "ballotType", "embeddedId.party", EMBEDDED_ID_BALLOT_ID, "partyAvgBornYear", "avgBornYear", "partyPercentageMale", "percentageMale", "noWinner" }; + /** The Constant LISTENER. */ private static final PageItemPropertyClickListener LISTENER = new PageItemPropertyClickListener( UserViews.BALLOT_VIEW_NAME, EMBEDDED_ID_BALLOT_ID); + /** The Constant NESTED_PROPERTIES. */ private static final String[] NESTED_PROPERTIES = { EMBEDDED_ID_BALLOT_ID, "embeddedId.concern", "embeddedId.issue", "embeddedId.party" }; diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianBallotConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianBallotConstants.java index 71d4c88942..70b1e4d5d4 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianBallotConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianBallotConstants.java @@ -1,17 +1,30 @@ package com.hack23.cia.web.impl.ui.application.views.user.politician.pagemode; +/** + * The Interface PoliticianBallotConstants. + */ public interface PoliticianBallotConstants { + + /** The ballot id. */ String BALLOT_ID = "ballotId"; + + /** The column order. */ String[] COLUMN_ORDER = { "voteDate", "rm", "org", "committeeReport", "title", "subTitle", "winner", "embeddedId.concern", "embeddedId.issue", "vote", "won", "rebel", "noWinner", "approved", "partyApproved", "againstProposalNumber", "againstProposalParties", "totalVotes", "partyTotalVotes", "yesVotes", "partyYesVotes", "noVotes", "partyNoVotes", "partyAbstainVotes", "abstainVotes", "partyAbsentVotes", "absentVotes", "bornYear", "partyAvgBornYear", "avgBornYear", "ballotType", "decisionType", "ballotId" }; + + /** The hide columns. */ String[] HIDE_COLUMNS = { "label", "endNumber", "publicDate", "createdDate", "embeddedId", "partyNoWinner", "partyPercentageYes", "partyPercentageNo", "partyPercentageAbsent", "partyPercentageAbstain", "percentageYes", "percentageNo", "percentageAbsent", "percentageAbstain", "firstName", "lastName", "party", "ballotId", "decisionType", "ballotType", "againstProposalNumber" }; + + /** The nested properties. */ String[] NESTED_PROPERTIES = { "embeddedId.concern", "embeddedId.issue" }; + + /** The committee ballot decision summary. */ String COMMITTEE_BALLOT_DECISION_SUMMARY = "Committee Ballot Decision Summary"; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianBallotDecisionSummaryPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianBallotDecisionSummaryPageModContentFactoryImpl.java index a267c00fa7..bf4c6e2087 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianBallotDecisionSummaryPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianBallotDecisionSummaryPageModContentFactoryImpl.java @@ -47,6 +47,7 @@ public final class PoliticianBallotDecisionSummaryPageModContentFactoryImpl extends AbstractPoliticianPageModContentFactoryImpl { + /** The Constant LISTENER. */ private static final PageItemPropertyClickListener LISTENER = new PageItemPropertyClickListener( UserViews.BALLOT_VIEW_NAME, PoliticianBallotConstants.BALLOT_ID); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianConfigurationConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianConfigurationConstants.java index 728783af85..4bb4614f30 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianConfigurationConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianConfigurationConstants.java @@ -4,15 +4,25 @@ * Configuration constants for politician view components. */ public interface PoliticianConfigurationConstants { + + /** The default page size. */ // Grid Configuration int DEFAULT_PAGE_SIZE = 10; + + /** The grid multiselect. */ boolean GRID_MULTISELECT = false; - - // Image Configuration + + /** The default image width. */ + // Image Configuration int DEFAULT_IMAGE_WIDTH = 100; + + /** The image protocol. */ String IMAGE_PROTOCOL = "https://"; - + + /** The default expand ratio. */ // Layout Configuration float DEFAULT_EXPAND_RATIO = 1.0f; + + /** The default spacing. */ int DEFAULT_SPACING = 10; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianDescriptionConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianDescriptionConstants.java index db6cf7f141..4b7e9e2206 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianDescriptionConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianDescriptionConstants.java @@ -1,11 +1,28 @@ package com.hack23.cia.web.impl.ui.application.views.user.politician.pagemode; +/** + * The Interface PoliticianDescriptionConstants. + */ public interface PoliticianDescriptionConstants { + + /** The current position desc. */ String CURRENT_POSITION_DESC = "Current position in parliament"; + + /** The electoral district desc. */ String ELECTORAL_DISTRICT_DESC = "Electoral district"; + + /** The years in parliament desc. */ String YEARS_IN_PARLIAMENT_DESC = "Years in parliament"; + + /** The party prefix. */ String PARTY_PREFIX = "Party "; + + /** The picture desc format. */ String PICTURE_DESC_FORMAT = "Picture of %s %s"; + + /** The visit trends title. */ String VISIT_TRENDS_TITLE = "Visit Trends"; + + /** The visit history desc. */ String VISIT_HISTORY_DESC = "Analyze patterns and trends in the politician's page visit history."; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianDocumentActivityPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianDocumentActivityPageModContentFactoryImpl.java index f7382e3d2e..fa23036a3c 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianDocumentActivityPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianDocumentActivityPageModContentFactoryImpl.java @@ -61,9 +61,9 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina final String pageId = getPageId(parameters); final ViewRiksdagenPolitician viewRiksdagenPolitician = getItem(parameters); getPoliticianMenuItemFactory().createPoliticianMenuBar(menuBar, pageId); - + CardInfoRowUtil.createPageHeader(panel, panelContent, - PoliticianPageTitleFormatter.formatTitle(viewRiksdagenPolitician, + PoliticianPageTitleFormatter.formatTitle(viewRiksdagenPolitician, PoliticianPageTitleConstants.DOCUMENT_ACTIVITY_TITLE), PoliticianPageTitleConstants.ACTIVITY_SUBTITLE, PoliticianPageTitleConstants.DOC_ACTIVITY_DESC); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianDocumentConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianDocumentConstants.java index 254675a7b4..13bbfabd10 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianDocumentConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianDocumentConstants.java @@ -1,10 +1,19 @@ package com.hack23.cia.web.impl.ui.application.views.user.politician.pagemode; +/** + * The Interface PoliticianDocumentConstants. + */ public interface PoliticianDocumentConstants { + + /** The column order. */ String[] COLUMN_ORDER = { "rm", "madePublicDate", "documentType", "subType", - "title", "subTitle", "referenceName", "partyShortCode", "personReferenceId", "roleDescription", + "title", "subTitle", "referenceName", "partyShortCode", "personReferenceId", "roleDescription", "org", "id", "docId", "tempLabel", "label", "numberValue", "orderNumber", "status" }; + + /** The hide columns. */ String[] HIDE_COLUMNS = { "id", "partyShortCode", "personReferenceId", "numberValue", "orderNumber", "tempLabel", "referenceName", "docId", "label", "roleDescription" }; + + /** The document grid name. */ String DOCUMENT_GRID_NAME = "Documents"; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianDocumentHistoryPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianDocumentHistoryPageModContentFactoryImpl.java index a720ba182c..56e106f556 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianDocumentHistoryPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianDocumentHistoryPageModContentFactoryImpl.java @@ -43,12 +43,19 @@ public final class PoliticianDocumentHistoryPageModContentFactoryImpl extends AbstractPoliticianPageModContentFactoryImpl { + /** The Constant COLUMN_ORDER. */ private static final String[] COLUMN_ORDER = { "rm", "madePublicDate", "documentType", "subType", "title", "subTitle", "referenceName", "partyShortCode", "personReferenceId", "roleDescription", "org", "id", "docId", "tempLabel", "label", "numberValue", "orderNumber", "status" }; + + /** The Constant DOCUMENTS. */ private static final String DOCUMENTS = "Documents"; + + /** The Constant HIDE_COLUMNS. */ private static final String[] HIDE_COLUMNS = { "id", "partyShortCode", "personReferenceId", "numberValue", "orderNumber", "tempLabel", "referenceName", "docId", "label", "roleDescription" }; + + /** The Constant LISTENER. */ private static final PageItemPropertyClickListener LISTENER = new PageItemPropertyClickListener( UserViews.DOCUMENT_VIEW_NAME, "docId", true); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianExperienceConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianExperienceConstants.java index af80dce0cf..680ffce803 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianExperienceConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianExperienceConstants.java @@ -1,11 +1,28 @@ package com.hack23.cia.web.impl.ui.application.views.user.politician.pagemode; +/** + * The Interface PoliticianExperienceConstants. + */ public interface PoliticianExperienceConstants { + + /** The committee experience. */ String COMMITTEE_EXPERIENCE = "Committee experience:"; + + /** The eu experience. */ String EU_EXPERIENCE = "EU experience:"; + + /** The government experience. */ String GOVERNMENT_EXPERIENCE = "Government experience:"; + + /** The parliament experience. */ String PARLIAMENT_EXPERIENCE = "Parliament experience:"; + + /** The party experience. */ String PARTY_EXPERIENCE = "Party experience:"; + + /** The speaker experience. */ String SPEAKER_EXPERIENCE = "Speaker experience:"; + + /** The total assignments. */ String TOTAL_ASSIGNMENTS = "Total Assignments:"; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianGridConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianGridConstants.java index 37bfd24c1c..68e727469b 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianGridConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianGridConstants.java @@ -1,23 +1,33 @@ package com.hack23.cia.web.impl.ui.application.views.user.politician.pagemode; +/** + * The Interface PoliticianGridConstants. + */ public interface PoliticianGridConstants { + + /** The doc history column order. */ // Document History Grid String[] DOC_HISTORY_COLUMN_ORDER = { "rm", "madePublicDate", "documentType", "subType", - "title", "subTitle", "referenceName", "partyShortCode", "personReferenceId", "roleDescription", + "title", "subTitle", "referenceName", "partyShortCode", "personReferenceId", "roleDescription", "org", "id", "docId", "tempLabel", "label", "numberValue", "orderNumber", "status" }; + + /** The doc history hidden columns. */ String[] DOC_HISTORY_HIDDEN_COLUMNS = { "id", "partyShortCode", "personReferenceId", "numberValue", "orderNumber", "tempLabel", "referenceName", "docId", "label", "roleDescription" }; + /** The ballot decision column order. */ // Ballot Decision Grid String[] BALLOT_DECISION_COLUMN_ORDER = { "voteDate", "rm", "org", "committeeReport", "title", - "subTitle", "winner", "embeddedId.concern", "embeddedId.issue", "vote", "won", "rebel", - "noWinner", "approved", "partyApproved", "againstProposalNumber", "againstProposalParties", - "totalVotes", "partyTotalVotes", "yesVotes", "partyYesVotes", "noVotes", "partyNoVotes", - "partyAbstainVotes", "abstainVotes", "partyAbsentVotes", "absentVotes", "bornYear", + "subTitle", "winner", "embeddedId.concern", "embeddedId.issue", "vote", "won", "rebel", + "noWinner", "approved", "partyApproved", "againstProposalNumber", "againstProposalParties", + "totalVotes", "partyTotalVotes", "yesVotes", "partyYesVotes", "noVotes", "partyNoVotes", + "partyAbstainVotes", "abstainVotes", "partyAbsentVotes", "absentVotes", "bornYear", "partyAvgBornYear", "avgBornYear", "ballotType", "decisionType", "ballotId" }; + + /** The ballot decision hidden columns. */ String[] BALLOT_DECISION_HIDDEN_COLUMNS = { "label", "endNumber", "publicDate", "createdDate", - "embeddedId", "partyNoWinner", "partyPercentageYes", "partyPercentageNo", - "partyPercentageAbsent", "partyPercentageAbstain", "percentageYes", "percentageNo", - "percentageAbsent", "percentageAbstain", "firstName", "lastName", "party", "ballotId", + "embeddedId", "partyNoWinner", "partyPercentageYes", "partyPercentageNo", + "partyPercentageAbsent", "partyPercentageAbstain", "percentageYes", "percentageNo", + "percentageAbsent", "percentageAbstain", "firstName", "lastName", "party", "ballotId", "decisionType", "ballotType", "againstProposalNumber" }; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianIndicatorsPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianIndicatorsPageModContentFactoryImpl.java index 277520cf55..c030d50a28 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianIndicatorsPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianIndicatorsPageModContentFactoryImpl.java @@ -61,7 +61,7 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina getPoliticianMenuItemFactory().createPoliticianMenuBar(menuBar, pageId); CardInfoRowUtil.createPageHeader(panel, panelContent, - PoliticianPageTitleFormatter.formatTitle(viewRiksdagenPolitician, + PoliticianPageTitleFormatter.formatTitle(viewRiksdagenPolitician, PoliticianPageTitleConstants.INDICATORS_TITLE), PoliticianPageTitleConstants.INDICATOR_SUBTITLE, PoliticianPageTitleConstants.INDICATORS_DESC); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianLayoutConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianLayoutConstants.java index 332c9e459b..89457cb988 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianLayoutConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianLayoutConstants.java @@ -1,8 +1,19 @@ package com.hack23.cia.web.impl.ui.application.views.user.politician.pagemode; +/** + * The Interface PoliticianLayoutConstants. + */ public interface PoliticianLayoutConstants { + + /** The politician image width. */ int POLITICIAN_IMAGE_WIDTH = 100; // Changed from String to int + + /** The width 100 percent. */ String WIDTH_100_PERCENT = "100%"; // Renamed for clarity + + /** The section expand ratio. */ float SECTION_EXPAND_RATIO = 1.0f; + + /** The details expand ratio. */ float DETAILS_EXPAND_RATIO = 1.0f; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianMetricConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianMetricConstants.java index e9c3f618f9..610c34183f 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianMetricConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianMetricConstants.java @@ -1,20 +1,43 @@ package com.hack23.cia.web.impl.ui.application.views.user.politician.pagemode; +/** + * The Interface PoliticianMetricConstants. + */ public interface PoliticianMetricConstants { + + /** The current role. */ // Current Status String CURRENT_ROLE = "Current Role:"; + + /** The region. */ String REGION = "Region:"; + + /** The career length. */ String CAREER_LENGTH = "Career Length:"; + + /** The years suffix. */ String YEARS_SUFFIX = " years"; - + + /** The top roles. */ // Knowledge and Experience String TOP_ROLES = "Top Roles:"; + + /** The knowledge areas. */ String KNOWLEDGE_AREAS = "Knowledge Areas:"; + + /** The political analysis. */ String POLITICAL_ANALYSIS = "Political Analysis:"; - + + /** The party loyalty. */ // Metrics String PARTY_LOYALTY = "Party Loyalty:"; + + /** The attendance rate. */ String ATTENDANCE_RATE = "Attendance Rate:"; + + /** The documents authored. */ String DOCUMENTS_AUTHORED = "Documents Authored:"; + + /** The votes participated. */ String VOTES_PARTICIPATED = "Votes Participated:"; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianOverviewPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianOverviewPageModContentFactoryImpl.java index eb91307c37..6c5efbc1a0 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianOverviewPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianOverviewPageModContentFactoryImpl.java @@ -55,6 +55,7 @@ @Component public final class PoliticianOverviewPageModContentFactoryImpl extends AbstractPoliticianPageModContentFactoryImpl { + /** The politician leaderboard util. */ @Autowired private PoliticianLeaderboardUtil politicianLeaderboardUtil; @@ -307,8 +308,8 @@ private void addImage(final PersonData personData, final ViewRiksdagenPolitician final String imageUrl = personData.getImageUrl192().replace("http://", "https://"); final Image image = new Image("", new ExternalResource(imageUrl)); image.setDescription( - String.format(Locale.ENGLISH, PoliticianDescriptionConstants.PICTURE_DESC_FORMAT, - viewRiksdagenPolitician.getFirstName(), + String.format(Locale.ENGLISH, PoliticianDescriptionConstants.PICTURE_DESC_FORMAT, + viewRiksdagenPolitician.getFirstName(), viewRiksdagenPolitician.getLastName())); image.setWidth(PoliticianLayoutConstants.POLITICIAN_IMAGE_WIDTH, Unit.PIXELS); image.addStyleName(PoliticianStyleConstants.POLITICIAN_IMAGE); @@ -328,9 +329,9 @@ private void addImage(final PersonData personData, final ViewRiksdagenPolitician private void addPoliticalRoleMetrics(VerticalLayout layout, ViewRiksdagenPolitician politician, ViewRiksdagenPoliticianBallotSummary ballotSummary, ViewRiksdagenPoliticianExperienceSummary experienceSummary) { - layout.addComponent(CardInfoRowUtil.createInfoRow(PoliticianMetricConstants.CURRENT_ROLE, + layout.addComponent(CardInfoRowUtil.createInfoRow(PoliticianMetricConstants.CURRENT_ROLE, ballotSummary.getStatus(), VaadinIcons.INSTITUTION, PoliticianDescriptionConstants.CURRENT_POSITION_DESC)); - layout.addComponent(CardInfoRowUtil.createInfoRow(PoliticianMetricConstants.REGION, + layout.addComponent(CardInfoRowUtil.createInfoRow(PoliticianMetricConstants.REGION, ballotSummary.getElectionRegion(), VaadinIcons.MAP_MARKER, "Electoral district")); layout.addComponent(CardInfoRowUtil.createInfoRow("Career Length:", calculateServiceYears(politician.getFirstAssignmentDate(), politician.getLastAssignmentDate()), diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianPageTitleConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianPageTitleConstants.java index b75e966e7d..98c7875f15 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianPageTitleConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianPageTitleConstants.java @@ -1,39 +1,95 @@ package com.hack23.cia.web.impl.ui.application.views.user.politician.pagemode; +/** + * The Interface PoliticianPageTitleConstants. + */ public interface PoliticianPageTitleConstants { + + /** The page title format. */ // Page Headers String PAGE_TITLE_FORMAT = "%s %s (%s)"; - + + /** The overview title. */ // Page Titles String OVERVIEW_TITLE = "Politician Overview"; + + /** The document activity title. */ String DOCUMENT_ACTIVITY_TITLE = "Document Activity"; + + /** The document history title. */ String DOCUMENT_HISTORY_TITLE = "Document History"; + + /** The indicators title. */ String INDICATORS_TITLE = "Performance Indicators"; + + /** The role list title. */ String ROLE_LIST_TITLE = "Role List"; + + /** The role summary title. */ String ROLE_SUMMARY_TITLE = "Role Summary"; + + /** The ballot summary title. */ String BALLOT_SUMMARY_TITLE = "Ballot Decision Summary"; + + /** The votes history title. */ String VOTES_HISTORY_TITLE = "Votes History"; + + /** The role gantt title. */ String ROLE_GANTT_TITLE = "Role Gantt Chart"; + /** The overview subtitle. */ // Subtitles String OVERVIEW_SUBTITLE = "Politician Details"; + + /** The activity subtitle. */ String ACTIVITY_SUBTITLE = "Activity Overview"; + + /** The history subtitle. */ String HISTORY_SUBTITLE = "History Overview"; + + /** The indicator subtitle. */ String INDICATOR_SUBTITLE = "Indicator Overview"; + + /** The roles subtitle. */ String ROLES_SUBTITLE = "Roles Overview"; + + /** The summary subtitle. */ String SUMMARY_SUBTITLE = "Summary Overview"; + + /** The ballot subtitle. */ String BALLOT_SUBTITLE = "Decision Summary Overview"; + + /** The votes subtitle. */ String VOTES_SUBTITLE = "Voting Record"; + + /** The gantt subtitle. */ String GANTT_SUBTITLE = "Role Timeline"; + /** The overview desc. */ // Descriptions String OVERVIEW_DESC = "Detailed profiles and activities of politicians."; + + /** The doc activity desc. */ String DOC_ACTIVITY_DESC = "Detailed insights into the politician's document-related legislative activities."; + + /** The doc history desc. */ String DOC_HISTORY_DESC = "Historical record of documents associated with the politician's roles and activities."; + + /** The indicators desc. */ String INDICATORS_DESC = "Key performance indicators reflecting the politician's impact and activity."; + + /** The role list desc. */ String ROLE_LIST_DESC = "Explore the list of roles held by the politician across their career."; + + /** The role summary desc. */ String ROLE_SUMMARY_DESC = "Summarize the key roles and responsibilities of the politician."; + + /** The ballot desc. */ String BALLOT_DESC = "Summarize and analyze the politician's voting decisions on various ballots."; + + /** The votes desc. */ String VOTES_DESC = "Review the politician's voting history, including key decisions and patterns."; + + /** The gantt desc. */ String GANTT_DESC = "Visualize the timeline and duration of roles held by the politician."; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianPageTitleFormatter.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianPageTitleFormatter.java index c77c9c4947..706c90c943 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianPageTitleFormatter.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianPageTitleFormatter.java @@ -1,9 +1,21 @@ package com.hack23.cia.web.impl.ui.application.views.user.politician.pagemode; import java.util.Locale; + import com.hack23.cia.model.internal.application.data.politician.impl.ViewRiksdagenPolitician; +/** + * The Class PoliticianPageTitleFormatter. + */ public class PoliticianPageTitleFormatter { + + /** + * Format title. + * + * @param politician the politician + * @param pageTitle the page title + * @return the string + */ public static String formatTitle(ViewRiksdagenPolitician politician, String pageTitle) { return String.format(Locale.ENGLISH, PoliticianPageTitleConstants.PAGE_TITLE_FORMAT, politician.getFirstName(), diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianRankingChartsCurrentPartiesPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianRankingChartsCurrentPartiesPageModContentFactoryImpl.java index a7ff0eb33f..527d50c6f4 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianRankingChartsCurrentPartiesPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianRankingChartsCurrentPartiesPageModContentFactoryImpl.java @@ -75,8 +75,8 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina PoliticianRankingDescriptionConstants.CURRENT_PARTIES_SUBTITLE, PoliticianRankingDescriptionConstants.CURRENT_PARTIES_DESC); - chartDataManager.createChartPanel(panelContent, - dataSeriesFactory.createPartyChartTimeSeriesCurrent(), + chartDataManager.createChartPanel(panelContent, + dataSeriesFactory.createPartyChartTimeSeriesCurrent(), PoliticianRankingConstants.CHART_TYPE_CURRENT); getPageActionEventHelper().createPageEvent(ViewAction.VISIT_POLITICIAN_RANKING_VIEW, ApplicationEventGroup.USER, diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianRankingConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianRankingConstants.java index 9fd13c4801..37ff3af5ac 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianRankingConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianRankingConstants.java @@ -2,8 +2,17 @@ import com.hack23.cia.web.impl.ui.application.views.common.viewnames.UserViews; +/** + * The Interface PoliticianRankingConstants. + */ public interface PoliticianRankingConstants { + + /** The name. */ String NAME = UserViews.POLITICIAN_RANKING_VIEW_NAME; + + /** The chart type current. */ String CHART_TYPE_CURRENT = "Current"; + + /** The chart type all. */ String CHART_TYPE_ALL = "All"; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianRankingDataGridPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianRankingDataGridPageModContentFactoryImpl.java index af6484161f..2ded6d41dc 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianRankingDataGridPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianRankingDataGridPageModContentFactoryImpl.java @@ -44,95 +44,12 @@ public final class PoliticianRankingDataGridPageModContentFactoryImpl extends AbstractPoliticianRankingPageModContentFactoryImpl { - /** The Constant COLUMN_ORDER. */ - private static final String[] COLUMN_ORDER = { - // Basic Information - "personId", - "firstName", - "lastName", - "party", - "gender", - - // Current Activity & Performance - "documentsLastYear", // Recent activity - "averageDocsPerYear", // Productivity metric - "docActivityLevel", // Activity classification - "docActivityProfile", // Work style - "collaborationPercentage", // Team player metric - - // Document Breakdown - "totalDocuments", // Total contribution - "individualMotions", // Individual initiatives - "partyMotions", // Party work - "committeeMotions", // Committee work - "multiPartyMotions", // Collaboration metric - - // Current Roles - "currentAssignments", - "currentMinistryAssignments", - "currentCommitteeAssignments", - "currentCommitteeLeadershipAssignments", - - // Historical Performance - "documentYearsActive", // Experience metric - "totalDaysServed", - "totalCommitteeAssignments", - "totalMinistryAssignments", - - // Dates for Context - "firstAssignmentDate", - "lastAssignmentDate", - "firstDocumentDate", - "lastDocumentDate" - }; - - /** The Constant HIDE_COLUMNS. */ - /** The Constant HIDE_COLUMNS. */ - private static final String[] HIDE_COLUMNS = { - // Hidden IDs and Boolean Flags - "personId", - "active", - "activeEu", - "activeGovernment", - "activeCommittee", - "activeParliament", - "activeParty", - "activeSpeaker", - "bornYear", - - // Hidden Detail Metrics - "followUpMotions", - "totalDaysServedParliament", - "totalDaysServedCommittee", - "totalDaysServedGovernment", - "totalDaysServedEu", - "totalDaysServedSpeaker", - "totalDaysServedParty", - "totalDaysServedCommitteeSubstitute", - "totalDaysServedCommitteeLeadership", - - // Hidden Assignment Details - "totalPartyAssignments", - "totalSpeakerAssignments", - "currentPartyAssignments", - "currentSpeakerAssignments", - "totalCommitteeSubstituteAssignments", - "currentCommitteeSubstituteAssignments", - - // Hidden Technical Fields - "documentTypes", - "documentTypesString" - }; - /** The Constant LISTENER. */ private static final PageItemPropertyClickListener LISTENER = new PageItemPropertyClickListener(UserViews.POLITICIAN_VIEW_NAME, "personId"); /** The Constant NAME. */ public static final String NAME = UserViews.POLITICIAN_RANKING_VIEW_NAME; - /** The Constant POLITICIANS. */ - private static final String POLITICIANS = "Politicians"; - /** * Instantiates a new politician ranking data grid page mod content factory * impl. diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianRankingDescriptionConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianRankingDescriptionConstants.java index 3ed18fedac..d74533720c 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianRankingDescriptionConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianRankingDescriptionConstants.java @@ -1,28 +1,57 @@ package com.hack23.cia.web.impl.ui.application.views.user.politician.pagemode; +/** + * The Interface PoliticianRankingDescriptionConstants. + */ public interface PoliticianRankingDescriptionConstants { + + /** The ranking header. */ // Overview Page String RANKING_HEADER = "Politician Rankings"; + + /** The ranking subtitle. */ String RANKING_SUBTITLE = "Ranking Overview"; + + /** The ranking desc. */ String RANKING_DESC = "Evaluate and rank politicians based on performance and influence."; - + + /** The performance header. */ // Performance View String PERFORMANCE_HEADER = "Politician Performance Overview"; + + /** The performance subtitle. */ String PERFORMANCE_SUBTITLE = "Performance Rankings"; + + /** The performance desc. */ String PERFORMANCE_DESC = "Review rankings of politicians based on tenure, contributions, and performance metrics."; - + + /** The current parties header. */ // Charts - Current Parties String CURRENT_PARTIES_HEADER = "Politician Ranking - Current Parties Charts"; + + /** The current parties subtitle. */ String CURRENT_PARTIES_SUBTITLE = "Current Political Landscape"; + + /** The current parties desc. */ String CURRENT_PARTIES_DESC = "Current parties: assessing dynamic political landscapes."; - + + /** The all parties header. */ // Charts - All Parties String ALL_PARTIES_HEADER = "Politician Ranking - All Parties Charts"; + + /** The all parties subtitle. */ String ALL_PARTIES_SUBTITLE = "Cross-Party Influence"; + + /** The all parties desc. */ String ALL_PARTIES_DESC = "All parties: mapping politician influence across coalitions."; - + + /** The visit history header. */ // Visit History String VISIT_HISTORY_HEADER = "Politician Ranking - Page Visit History"; + + /** The visit history subtitle. */ String VISIT_HISTORY_SUBTITLE = "Engagement Trends"; + + /** The visit history desc. */ String VISIT_HISTORY_DESC = "Viewing interest trends to understand shifting political focus."; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianRankingGridConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianRankingGridConstants.java index 38923e4892..c6ee965e9c 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianRankingGridConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianRankingGridConstants.java @@ -1,28 +1,35 @@ package com.hack23.cia.web.impl.ui.application.views.user.politician.pagemode; +/** + * The Interface PoliticianRankingGridConstants. + */ public interface PoliticianRankingGridConstants { + + /** The politicians. */ String POLITICIANS = "Politicians"; - + + /** The column order. */ String[] COLUMN_ORDER = { // Basic Information "personId", "firstName", "lastName", "party", "gender", // Current Activity & Performance - "documentsLastYear", "averageDocsPerYear", "docActivityLevel", + "documentsLastYear", "averageDocsPerYear", "docActivityLevel", "docActivityProfile", "collaborationPercentage", // Document Breakdown - "totalDocuments", "individualMotions", "partyMotions", + "totalDocuments", "individualMotions", "partyMotions", "committeeMotions", "multiPartyMotions", // Current Roles - "currentAssignments", "currentMinistryAssignments", + "currentAssignments", "currentMinistryAssignments", "currentCommitteeAssignments", "currentCommitteeLeadershipAssignments", // Historical Performance - "documentYearsActive", "totalDaysServed", "totalCommitteeAssignments", + "documentYearsActive", "totalDaysServed", "totalCommitteeAssignments", "totalMinistryAssignments", // Dates for Context - "firstAssignmentDate", "lastAssignmentDate", "firstDocumentDate", + "firstAssignmentDate", "lastAssignmentDate", "firstDocumentDate", "lastDocumentDate" }; + /** The hide columns. */ String[] HIDE_COLUMNS = { // Hidden IDs and Boolean Flags "personId", "active", "activeEu", "activeGovernment", "activeCommittee", diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianResourceConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianResourceConstants.java index 19b158352c..25b3f32524 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianResourceConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianResourceConstants.java @@ -1,12 +1,26 @@ package com.hack23.cia.web.impl.ui.application.views.user.politician.pagemode; +/** + * The Interface PoliticianResourceConstants. + */ public interface PoliticianResourceConstants { + + /** The politiker url text. */ String POLITIKER_URL_TEXT = "Riksdagen description of politician"; + + /** The img source property. */ String IMG_SOURCE_PROPERTY = "imageUrl192"; + + /** The default picture path. */ String DEFAULT_PICTURE_PATH = "https://data.riksdagen.se/filarkiv/bilder/ledamot/0000000.jpg"; - + + /** The current position desc. */ // Link tooltips and descriptions String CURRENT_POSITION_DESC = "Current position in parliament"; + + /** The electoral district desc. */ String ELECTORAL_DISTRICT_DESC = "Electoral district"; + + /** The picture desc format. */ String PICTURE_DESC_FORMAT = "Picture of %s %s"; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianRoleConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianRoleConstants.java index 62ed58bdac..96080e48f7 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianRoleConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianRoleConstants.java @@ -1,25 +1,56 @@ package com.hack23.cia.web.impl.ui.application.views.user.politician.pagemode; +/** + * The Interface PoliticianRoleConstants. + */ public interface PoliticianRoleConstants { + + /** The assignments. */ // Role List Grid String ASSIGNMENTS = "Assignments"; + + /** The role column order. */ String[] ROLE_COLUMN_ORDER = { "roleCode", "assignmentType", "status", "detail", "orgCode", "fromDate", "toDate" }; + + /** The role hide columns. */ String[] ROLE_HIDE_COLUMNS = { "hjid", "intressentId", "orderNumber", "orgCode" }; + /** The committee experience. */ // Experience Labels String COMMITTEE_EXPERIENCE = "Committee experience:"; + + /** The eu experience. */ String EU_EXPERIENCE = "EU experience:"; + + /** The government experience. */ String GOVERNMENT_EXPERIENCE = "Government experience:"; + + /** The parliament experience. */ String PARLIAMENT_EXPERIENCE = "Parliament experience:"; + + /** The party experience. */ String PARTY_EXPERIENCE = "Party experience:"; + + /** The speaker experience. */ String SPEAKER_EXPERIENCE = "Speaker experience:"; + + /** The total assignments. */ String TOTAL_ASSIGNMENTS = "Total Assignments:"; + /** The section role influence. */ // Section Headers String SECTION_ROLE_INFLUENCE = "Political Role & Influence"; + + /** The section experience. */ String SECTION_EXPERIENCE = "Experience & Expertise"; + + /** The section performance. */ String SECTION_PERFORMANCE = "Parliamentary Performance"; + + /** The section legislative. */ String SECTION_LEGISLATIVE = "Legislative Impact"; + + /** The section party alignment. */ String SECTION_PARTY_ALIGNMENT = "Party Alignment & Cooperation"; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianRoleGhantPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianRoleGhantPageModContentFactoryImpl.java index e60bcfda46..474a4820d8 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianRoleGhantPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianRoleGhantPageModContentFactoryImpl.java @@ -44,6 +44,7 @@ @Component public final class PoliticianRoleGhantPageModContentFactoryImpl extends AbstractPoliticianPageModContentFactoryImpl { + /** The politician ghant chart manager. */ @Autowired private PoliticianGhantChartManager politicianGhantChartManager; @@ -64,7 +65,7 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina final ViewRiksdagenPolitician viewRiksdagenPolitician = getItem(parameters); getPoliticianMenuItemFactory().createPoliticianMenuBar(menuBar, pageId); - CardInfoRowUtil.createPageHeader(panel, panelContent, + CardInfoRowUtil.createPageHeader(panel, panelContent, PoliticianPageTitleFormatter.formatTitle(viewRiksdagenPolitician, PoliticianPageTitleConstants.ROLE_GANTT_TITLE), PoliticianPageTitleConstants.GANTT_SUBTITLE, PoliticianPageTitleConstants.GANTT_DESC); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianRoleListPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianRoleListPageModContentFactoryImpl.java index 9fb38bbf5f..77aacab7e9 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianRoleListPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianRoleListPageModContentFactoryImpl.java @@ -60,7 +60,7 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina final ViewRiksdagenPolitician viewRiksdagenPolitician = getItem(parameters); getPoliticianMenuItemFactory().createPoliticianMenuBar(menuBar, pageId); - CardInfoRowUtil.createPageHeader(panel, panelContent, + CardInfoRowUtil.createPageHeader(panel, panelContent, PoliticianPageTitleFormatter.formatTitle(viewRiksdagenPolitician, PoliticianPageTitleConstants.ROLE_LIST_TITLE), PoliticianPageTitleConstants.ROLES_SUBTITLE, PoliticianPageTitleConstants.ROLE_LIST_DESC); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianRoleSummaryPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianRoleSummaryPageModContentFactoryImpl.java index 914960bff2..d069e532de 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianRoleSummaryPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianRoleSummaryPageModContentFactoryImpl.java @@ -44,27 +44,6 @@ @Component public final class PoliticianRoleSummaryPageModContentFactoryImpl extends AbstractPoliticianPageModContentFactoryImpl { - /** The Constant COMMITTEE_EXPERIENCE. */ - private static final String COMMITTEE_EXPERIENCE = "Committee experience:"; - - /** The Constant EU_EXPERIENCE. */ - private static final String EU_EXPERIENCE = "EU experience:"; - - /** The Constant GOVERNMENT_EXPERIENCE. */ - private static final String GOVERNMENT_EXPERIENCE = "Government experience:"; - - /** The Constant PARLIAMENT_EXPERIENCE. */ - private static final String PARLIAMENT_EXPERIENCE = "Parliament experience:"; - - /** The Constant PARTY_EXPERIENCE. */ - private static final String PARTY_EXPERIENCE = "Party experience:"; - - /** The Constant SPEAKER_EXPERIENCE. */ - private static final String SPEAKER_EXPERIENCE = "Speaker experience:"; - - /** The Constant TOTAL_ASSIGNMENTS. */ - private static final String TOTAL_ASSIGNMENTS = "Total Assignments:"; - /** * Instantiates a new politician role summary page mod content factory impl. */ diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianSectionHeaderConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianSectionHeaderConstants.java index 4a40bd38e9..9477920c0b 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianSectionHeaderConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianSectionHeaderConstants.java @@ -1,15 +1,33 @@ package com.hack23.cia.web.impl.ui.application.views.user.politician.pagemode; +/** + * The Interface PoliticianSectionHeaderConstants. + */ public interface PoliticianSectionHeaderConstants { + + /** The political role. */ // Main Sections String POLITICAL_ROLE = "Political Role & Influence"; + + /** The experience expertise. */ String EXPERIENCE_EXPERTISE = "Experience & Expertise"; + + /** The parliamentary performance. */ String PARLIAMENTARY_PERFORMANCE = "Parliamentary Performance"; + + /** The legislative impact. */ String LEGISLATIVE_IMPACT = "Legislative Impact"; + + /** The party alignment. */ String PARTY_ALIGNMENT = "Party Alignment & Cooperation"; - + + /** The ballots. */ // Grid Headers String BALLOTS = "Ballots"; + + /** The documents. */ String DOCUMENTS = "Documents"; + + /** The politicians. */ String POLITICIANS = "Politicians"; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianStyleConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianStyleConstants.java index 8b12a5ae18..650adab27c 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianStyleConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianStyleConstants.java @@ -1,8 +1,19 @@ package com.hack23.cia.web.impl.ui.application.views.user.politician.pagemode; +/** + * The Interface PoliticianStyleConstants. + */ public interface PoliticianStyleConstants { + + /** The politician overview card. */ String POLITICIAN_OVERVIEW_CARD = "politician-overview-card"; + + /** The politician image. */ String POLITICIAN_IMAGE = "politician-image"; + + /** The card subtitle. */ String CARD_SUBTITLE = "card-subtitle"; + + /** The card title. */ String CARD_TITLE = "card-title"; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianTitleFormatter.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianTitleFormatter.java index 856eb90693..08a7fca6ea 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianTitleFormatter.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianTitleFormatter.java @@ -2,10 +2,20 @@ import com.hack23.cia.model.internal.application.data.politician.impl.ViewRiksdagenPolitician; +/** + * The Class PoliticianTitleFormatter. + */ public class PoliticianTitleFormatter { + + /** + * Format title. + * + * @param politician the politician + * @return the string + */ public static String formatTitle(ViewRiksdagenPolitician politician) { - return politician.getFirstName() + ' ' + - politician.getLastName() + '(' + + return politician.getFirstName() + ' ' + + politician.getLastName() + '(' + politician.getParty() + ')'; } } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianViewConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianViewConstants.java index 60f7d69e5f..80cfd33539 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianViewConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianViewConstants.java @@ -3,7 +3,7 @@ /** * Constants for the politician view pages. */ -public interface PoliticianViewConstants extends +public interface PoliticianViewConstants extends PoliticianPageTitleConstants, PoliticianDocumentConstants, PoliticianBallotConstants, diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianVisitHistoryPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianVisitHistoryPageModContentFactoryImpl.java index bcd8ce3d42..231e9092e2 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianVisitHistoryPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianVisitHistoryPageModContentFactoryImpl.java @@ -33,7 +33,7 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina final VerticalLayout panelContent = createPanelContent(); final String pageId = getPageId(parameters); final ViewRiksdagenPolitician viewRiksdagenPolitician = getItem(parameters); - + getPoliticianMenuItemFactory().createPoliticianMenuBar(menuBar, pageId); CardInfoRowUtil.createPageHeader(panel, panelContent, diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianVoteHistoryConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianVoteHistoryConstants.java index 3e08ae682d..4169ee9609 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianVoteHistoryConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianVoteHistoryConstants.java @@ -1,19 +1,27 @@ package com.hack23.cia.web.impl.ui.application.views.user.politician.pagemode; +/** + * The Interface PoliticianVoteHistoryConstants. + */ public interface PoliticianVoteHistoryConstants { + + /** The embedded id ballot id. */ String EMBEDDED_ID_BALLOT_ID = "embeddedId.ballotId"; - + + /** The column order. */ String[] COLUMN_ORDER = { "voteDate", "rm", "label", "embeddedId.concern", - "embeddedId.issue", "vote", "won", "partyWon", "rebel", "noWinner", "approved", - "partyApproved", "totalVotes", "partyTotalVotes", "yesVotes", "partyYesVotes", - "noVotes", "partyNoVotes", "partyAbstainVotes", "abstainVotes", "partyAbsentVotes", - "absentVotes", "bornYear", "partyAvgBornYear", "avgBornYear", "gender", + "embeddedId.issue", "vote", "won", "partyWon", "rebel", "noWinner", "approved", + "partyApproved", "totalVotes", "partyTotalVotes", "yesVotes", "partyYesVotes", + "noVotes", "partyNoVotes", "partyAbstainVotes", "abstainVotes", "partyAbsentVotes", + "absentVotes", "bornYear", "partyAvgBornYear", "avgBornYear", "gender", "partyPercentageMale", "percentageMale", "ballotType", "embeddedId.ballotId" }; - + + /** The hide columns. */ String[] HIDE_COLUMNS = { "embeddedId", "partyNoWinner", "partyPercentageYes", - "partyPercentageNo", "partyPercentageAbsent", "partyPercentageAbstain", - "percentageYes", "percentageNo", "percentageAbsent", "percentageAbstain", + "partyPercentageNo", "partyPercentageAbsent", "partyPercentageAbstain", + "percentageYes", "percentageNo", "percentageAbsent", "percentageAbstain", "firstName", "lastName", "party", "embeddedId.ballotId", "ballotType" }; - + + /** The nested properties. */ String[] NESTED_PROPERTIES = { "embeddedId.ballotId", "embeddedId.concern", "embeddedId.issue" }; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianVotesHistoryPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianVotesHistoryPageModContentFactoryImpl.java index 828b0608da..d87bbe7141 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianVotesHistoryPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianVotesHistoryPageModContentFactoryImpl.java @@ -42,21 +42,9 @@ @Component public final class PoliticianVotesHistoryPageModContentFactoryImpl extends AbstractPoliticianPageModContentFactoryImpl { - private static final String BALLOTS = "Ballots"; - private static final String EMBEDDED_ID_BALLOT_ID = "embeddedId.ballotId"; - private static final String[] COLUMN_ORDER = { "voteDate", "rm", "label", "embeddedId.concern", - "embeddedId.issue", "vote", "won", "partyWon", "rebel", "noWinner", "approved", "partyApproved", - "totalVotes", "partyTotalVotes", "yesVotes", "partyYesVotes", "noVotes", "partyNoVotes", - "partyAbstainVotes", "abstainVotes", "partyAbsentVotes", "absentVotes", "bornYear", "partyAvgBornYear", - "avgBornYear", "gender", "partyPercentageMale", "percentageMale", "ballotType", EMBEDDED_ID_BALLOT_ID }; - private static final String[] HIDE_COLUMNS = { "embeddedId", "partyNoWinner", "partyPercentageYes", - "partyPercentageNo", "partyPercentageAbsent", "partyPercentageAbstain", "percentageYes", "percentageNo", - "percentageAbsent", "percentageAbstain", "firstName", "lastName", "party", EMBEDDED_ID_BALLOT_ID, - "ballotType" }; + /** The Constant LISTENER. */ private static final PageItemPropertyClickListener LISTENER = new PageItemPropertyClickListener( UserViews.BALLOT_VIEW_NAME, PoliticianVoteHistoryConstants.EMBEDDED_ID_BALLOT_ID); - private static final String[] NESTED_PROPERTIES = { EMBEDDED_ID_BALLOT_ID, "embeddedId.concern", - "embeddedId.issue" }; /** * The view riksdagen vote data ballot politician summary chart data * manager. diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/web/listener/AuthorizationFailureEventListener.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/web/listener/AuthorizationFailureEventListener.java index 8100310a8e..e2fbfe0ecf 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/web/listener/AuthorizationFailureEventListener.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/web/listener/AuthorizationFailureEventListener.java @@ -42,6 +42,8 @@ /** * The Class AuthorizationFailureEventListener. + * + * @see AuthorizationFailureEventEvent */ @Service public final class AuthorizationFailureEventListener implements ApplicationListener { diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/web/listener/HttpSessionCreatedEventListener.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/web/listener/HttpSessionCreatedEventListener.java index 0fe86e3a43..0486a84c30 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/web/listener/HttpSessionCreatedEventListener.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/web/listener/HttpSessionCreatedEventListener.java @@ -26,6 +26,8 @@ /** * The Class HttpSessionCreatedEventListener. + * + * @see HttpSessionCreatedEventEvent */ @Service public final class HttpSessionCreatedEventListener implements ApplicationListener { diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/web/listener/HttpSessionDestroyedEventListener.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/web/listener/HttpSessionDestroyedEventListener.java index fb8b5fa6bb..c5418db068 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/web/listener/HttpSessionDestroyedEventListener.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/web/listener/HttpSessionDestroyedEventListener.java @@ -38,6 +38,8 @@ /** * The Class HttpSessionDestroyedEventListener. + * + * @see HttpSessionDestroyedEventEvent */ @Service public final class HttpSessionDestroyedEventListener implements ApplicationListener { diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/AbstractRoleSystemITest.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/AbstractRoleSystemITest.java index 9459e33e1a..f6f6e6e2ac 100644 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/AbstractRoleSystemITest.java +++ b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/AbstractRoleSystemITest.java @@ -38,6 +38,9 @@ public abstract class AbstractRoleSystemITest extends AbstractSystemIntegrationT /** The Constant usingExternalServer. */ protected static final boolean usingExternalServer; + /** The webdriver setup. */ + private static boolean webdriverSetup = false; + /** The Constant webDriverMap. */ static { final String systemTestTargetUrlProperty = System.getProperty("system.test.target.url"); @@ -63,7 +66,10 @@ public static final synchronized void startServer() throws Exception { if (!usingExternalServer) { CitizenIntelligenceAgencyServer.startTestServer(); } - WebDriverManager.getInstance(DriverManagerType.CHROME).setup(); + if(!webdriverSetup) { + WebDriverManager.getInstance(DriverManagerType.CHROME).setup(); + webdriverSetup=true; + } } /** diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/AbstractUITest.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/AbstractUITest.java index 774f373f5b..712aa9eded 100644 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/AbstractUITest.java +++ b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/AbstractUITest.java @@ -1,9 +1,7 @@ package com.hack23.cia.systemintegrationtest; import org.junit.After; -import org.junit.AfterClass; import org.junit.Before; -import org.junit.BeforeClass; import org.openqa.selenium.WebDriver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -12,45 +10,46 @@ import com.hack23.cia.systemintegrationtest.ui.UserPageVisit; import com.hack23.cia.systemintegrationtest.ui.WebDriverFactory; +/** + * The Class AbstractUITest. + */ public abstract class AbstractUITest extends AbstractRoleSystemITest { + + /** The Constant LOG. */ private static final Logger LOG = LoggerFactory.getLogger(AbstractUITest.class); + + /** The Constant DEFAULT_TIMEOUT. */ protected static final long DEFAULT_TIMEOUT = TestConstants.DEFAULT_TIMEOUT; + + /** The Constant BASE_URL. */ protected static final String BASE_URL = System.getProperty("system.test.target.url", CitizenIntelligenceAgencyServer.ACCESS_URL); - protected static WebDriver driver; - protected static UserPageVisit pageVisit; + /** The driver. */ + protected WebDriver driver; + + /** The page visit. */ + protected UserPageVisit pageVisit; - @BeforeClass - public static void globalSetup() { + /** + * Global setup. + */ + @Before + public void globalSetup() { LOG.info("Setting up test with browser"); driver = WebDriverFactory.createDriver(); pageVisit = new UserPageVisit(driver); } - @AfterClass - public static void globalTeardown() { + /** + * Global teardown. + */ + @After + public void globalTeardown() { LOG.info("Tearing down WebDriver after all tests have run"); if (driver != null) { driver.quit(); } } - @Before - public void setup() { - cleanBrowser(); - } - - @After - public void teardown() { - cleanBrowser(); - } - - private void cleanBrowser() { - if (driver != null) { - driver.manage().deleteAllCookies(); - driver.get("about:blank"); - } - } - } diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/admin/AbstractAdminTest.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/admin/AbstractAdminTest.java index 7d32af203e..5a7b10b7bc 100644 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/admin/AbstractAdminTest.java +++ b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/admin/AbstractAdminTest.java @@ -6,16 +6,29 @@ import com.hack23.cia.systemintegrationtest.AbstractUITest; import com.hack23.cia.systemintegrationtest.categories.IntegrationTest; +/** + * The Class AbstractAdminTest. + */ @Category(IntegrationTest.class) public abstract class AbstractAdminTest extends AbstractUITest { - + + /** + * Admin setup. + * + * @throws Exception the exception + */ @Before public void adminSetup() throws Exception { pageVisit.loginAsAdmin(); } - + + /** + * Verify view content. + * + * @param contentToVerify the content to verify + */ protected void verifyViewContent(final String... contentToVerify) { - for (String content : contentToVerify) { + for (final String content : contentToVerify) { pageVisit.verifyPageContent(content); } } diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/admin/configuration/AdminConfigurationTest.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/admin/configuration/AdminConfigurationTest.java index d2f68767e1..1e7d4c25af 100644 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/admin/configuration/AdminConfigurationTest.java +++ b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/admin/configuration/AdminConfigurationTest.java @@ -8,64 +8,79 @@ import com.hack23.cia.web.impl.ui.application.views.admin.AdminViewConstants; import com.hack23.cia.web.impl.ui.application.views.common.menufactory.api.PageCommandAdminConstants; +/** + * The Class AdminConfigurationTest. + */ @Category(IntegrationTest.class) public final class AdminConfigurationTest extends AbstractAdminTest { - @Test(timeout = DEFAULT_TIMEOUT) - public void verifyPortalConfiguration() throws Exception { - pageVisit.visitDirectPage(PageCommandAdminConstants.COMMAND_PORTAL); - verifyViewContent( - AdminViewConstants.ADMIN_PORTAL_MANAGEMENT, - AdminViewConstants.PORTAL_OVERVIEW, - AdminViewConstants.PORTAL_MANAGEMENT_DESCRIPTION - ); - pageVisit.validatePage(PageCommandAdminConstants.COMMAND_PORTAL); - } - @Test(timeout = DEFAULT_TIMEOUT) - public void verifyCountryConfiguration() throws Exception { - pageVisit.visitDirectPage(PageCommandAdminConstants.COMMAND_COUNTRY); - verifyViewContent( - AdminViewConstants.ADMIN_COUNTRY_MANAGEMENT, - AdminViewConstants.COUNTRY_OVERVIEW, - AdminViewConstants.COUNTRY_MANAGEMENT_DESCRIPTION - ); - pageVisit.validatePage(PageCommandAdminConstants.COMMAND_COUNTRY); - } + /** + * Verify portal configuration. + * + * @throws Exception the exception + */ + @Test(timeout = DEFAULT_TIMEOUT) + public void verifyPortalConfiguration() throws Exception { + pageVisit.visitDirectPage(PageCommandAdminConstants.COMMAND_PORTAL); + verifyViewContent(AdminViewConstants.ADMIN_PORTAL_MANAGEMENT, AdminViewConstants.PORTAL_OVERVIEW, + AdminViewConstants.PORTAL_MANAGEMENT_OVERVIEW); + pageVisit.validatePage(PageCommandAdminConstants.COMMAND_PORTAL); + } - @Test(timeout = DEFAULT_TIMEOUT) - public void verifyLanguageConfiguration() throws Exception { - pageVisit.visitDirectPage(PageCommandAdminConstants.COMMAND_LANGUAGE); - verifyViewContent( - AdminViewConstants.ADMIN_LANGUAGE_MANAGEMENT, - AdminViewConstants.LANGUAGE_OVERVIEW, - AdminViewConstants.LANGUAGE_MANAGEMENT_DESCRIPTION - ); - pageVisit.validatePage(PageCommandAdminConstants.COMMAND_LANGUAGE); - } + /** + * Verify country configuration. + * + * @throws Exception the exception + */ + @Test(timeout = DEFAULT_TIMEOUT) + public void verifyCountryConfiguration() throws Exception { + pageVisit.visitDirectPage(PageCommandAdminConstants.COMMAND_COUNTRY); + verifyViewContent(AdminViewConstants.ADMIN_COUNTRY_MANAGEMENT, AdminViewConstants.COUNTRY_OVERVIEW, + AdminViewConstants.COUNTRY_OVERVIEW_DESCRIPTION); + pageVisit.validatePage(PageCommandAdminConstants.COMMAND_COUNTRY); + } - @Test(timeout = DEFAULT_TIMEOUT) - public void verifyAgencyConfiguration() throws Exception { - pageVisit.visitDirectPage(PageCommandAdminConstants.COMMAND_AGENCY); - verifyViewContent( - AdminViewConstants.ADMIN_AGENCY_MANAGEMENT, - AdminViewConstants.AGENCY_OVERVIEW, - AdminViewConstants.AGENCY_MANAGEMENT_DESCRIPTION - ); - pageVisit.validatePage(PageCommandAdminConstants.COMMAND_AGENCY); - } + /** + * Verify language configuration. + * + * @throws Exception the exception + */ + @Test(timeout = DEFAULT_TIMEOUT) + public void verifyLanguageConfiguration() throws Exception { + pageVisit.visitDirectPage(PageCommandAdminConstants.COMMAND_LANGUAGE); + verifyViewContent(AdminViewConstants.ADMIN_LANGUAGE_MANAGEMENT, AdminViewConstants.LANGUAGE_OVERVIEW, + AdminViewConstants.LANGUAGE_ADMINISTRATION); + pageVisit.validatePage(PageCommandAdminConstants.COMMAND_LANGUAGE); + } - @Test(timeout = DEFAULT_TIMEOUT) - public void verifyApplicationConfiguration() throws Exception { - pageVisit.visitDirectPage(PageCommandAdminConstants.COMMAND_APPLICATION_CONFIGURATION); - verifyViewContent( - AdminViewConstants.ADMIN_APPLICATION_CONFIGURATION, - AdminViewConstants.APPLICATION_CONFIGURATION_OVERVIEW, - AdminViewConstants.APPLICATION_CONFIGURATION_DESCRIPTION - ); - pageVisit.selectFirstGridRow(); - pageVisit.validatePage(PageCommandAdminConstants.COMMAND_APPLICATION_CONFIGURATION); - pageVisit.updateConfigurationProperty("Update Configuration.propertyValue", String.valueOf(false)); - pageVisit.validatePage(PageCommandAdminConstants.COMMAND_APPLICATION_CONFIGURATION); - } + /** + * Verify agency configuration. + * + * @throws Exception the exception + */ + @Test(timeout = DEFAULT_TIMEOUT) + public void verifyAgencyConfiguration() throws Exception { + pageVisit.visitDirectPage(PageCommandAdminConstants.COMMAND_AGENCY); + verifyViewContent(AdminViewConstants.ADMIN_AGENCY_MANAGEMENT, AdminViewConstants.AGENCY_OVERVIEW_HEADER, + AdminViewConstants.AGENCY_OVERVIEW); + pageVisit.validatePage(PageCommandAdminConstants.COMMAND_AGENCY); + } + + /** + * Verify application configuration. + * + * @throws Exception the exception + */ + @Test(timeout = DEFAULT_TIMEOUT) + public void verifyApplicationConfiguration() throws Exception { + pageVisit.visitDirectPage(PageCommandAdminConstants.COMMAND_APPLICATION_CONFIGURATION); + verifyViewContent(AdminViewConstants.ADMIN_APPLICATION_CONFIGURATION, + AdminViewConstants.APPLICATION_CONFIGURATION_OVERVIEW, + AdminViewConstants.APPLICATION_CONFIGURATION_OVERVIEW); + pageVisit.selectFirstGridRow(); + pageVisit.validatePage(PageCommandAdminConstants.COMMAND_APPLICATION_CONFIGURATION); + pageVisit.updateConfigurationProperty("Update Configuration.propertyValue", String.valueOf(false)); + pageVisit.validatePage(PageCommandAdminConstants.COMMAND_APPLICATION_CONFIGURATION); + } } diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/admin/data/AdminDataTest.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/admin/data/AdminDataTest.java index 76eb340fa2..2fa958e59e 100644 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/admin/data/AdminDataTest.java +++ b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/admin/data/AdminDataTest.java @@ -2,16 +2,23 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -import org.openqa.selenium.WebElement; import com.hack23.cia.systemintegrationtest.admin.AbstractAdminTest; import com.hack23.cia.systemintegrationtest.categories.IntegrationTest; import com.hack23.cia.web.impl.ui.application.views.admin.AdminViewConstants; import com.hack23.cia.web.impl.ui.application.views.common.menufactory.api.PageCommandAdminConstants; +/** + * The Class AdminDataTest. + */ @Category(IntegrationTest.class) public final class AdminDataTest extends AbstractAdminTest { + /** + * Verify data summary. + * + * @throws Exception the exception + */ @Test(timeout = DEFAULT_TIMEOUT) public void verifyDataSummary() throws Exception { pageVisit.visitDirectPage(PageCommandAdminConstants.COMMAND_DATASUMMARY); @@ -20,38 +27,68 @@ public void verifyDataSummary() throws Exception { AdminViewConstants.DATA_SUMMARY_OVERVIEW ); pageVisit.validatePage(PageCommandAdminConstants.COMMAND_DATASUMMARY); + } + + /** + * Verify data summary author. + * + * @throws Exception the exception + */ + @Test(timeout = DEFAULT_TIMEOUT) + public void verifyDataSummaryAuthor() throws Exception { + pageVisit.visitDirectPage(PageCommandAdminConstants.COMMAND_AUTHOR_DATASUMMARY); + verifyViewContent( + AdminViewConstants.ADMIN_AUTHOR_SUMMARY, + AdminViewConstants.AUTHOR_OVERVIEW, AdminViewConstants.AUTHOR_DETAILED_SUMMARY + ); + pageVisit.validatePage(PageCommandAdminConstants.COMMAND_AUTHOR_DATASUMMARY); + + } + + /** + * Verify application events. + * + * @throws Exception the exception + */ @Test(timeout = DEFAULT_TIMEOUT) public void verifyApplicationEvents() throws Exception { pageVisit.visitDirectPage(PageCommandAdminConstants.COMMAND_APPLICATION_EVENTS); verifyViewContent( - AdminViewConstants.ADMIN_APPLICATION_EVENTS, - AdminViewConstants.APPLICATION_EVENTS_OVERVIEW, - AdminViewConstants.APPLICATION_EVENTS_DESCRIPTION + AdminViewConstants.ADMIN_APPLICATION_EVENTS, AdminViewConstants.EVENT_DETAILS, + AdminViewConstants.EVENT_REVIEW ); pageVisit.validatePage(PageCommandAdminConstants.COMMAND_APPLICATION_EVENTS); } + /** + * Verify application events charts. + * + * @throws Exception the exception + */ @Test(timeout = DEFAULT_TIMEOUT) public void verifyApplicationEventsCharts() throws Exception { pageVisit.visitDirectPage(PageCommandAdminConstants.COMMAND_APPLICATION_EVENTS_CHARTS); verifyViewContent( - AdminViewConstants.ADMIN_APPLICATION_EVENT_CHARTS, - AdminViewConstants.EVENT_ANALYSIS, - AdminViewConstants.EVENT_DETAILS + AdminViewConstants.ADMIN_APPLICATION_EVENT_CHARTS, AdminViewConstants.EVENT_ANALYSIS_HEADER, AdminViewConstants.EVENT_ANALYSIS ); pageVisit.validatePage(PageCommandAdminConstants.COMMAND_APPLICATION_EVENTS_CHARTS); } + /** + * Verify application sessions. + * + * @throws Exception the exception + */ @Test(timeout = DEFAULT_TIMEOUT) public void verifyApplicationSessions() throws Exception { pageVisit.visitDirectPage(PageCommandAdminConstants.COMMAND_APPLICATION_SESSION); verifyViewContent( - AdminViewConstants.ADMIN_APPLICATION_SESSION, - AdminViewConstants.APPLICATION_SESSION_OVERVIEW, - AdminViewConstants.APPLICATION_SESSION_DESCRIPTION - ); + AdminViewConstants.ADMIN_APPLICATION_SESSIONS, + AdminViewConstants.SESSION_DETAILS, + AdminViewConstants.SESSION_OVERVIEW + ); pageVisit.selectFirstGridRow(); verifyViewContent( AdminViewConstants.APPLICATION_SESSION_DETAILS, @@ -62,6 +99,11 @@ public void verifyApplicationSessions() throws Exception { pageVisit.validatePage(PageCommandAdminConstants.COMMAND_APPLICATION_SESSION); } + /** + * Verify session charts. + * + * @throws Exception the exception + */ @Test(timeout = DEFAULT_TIMEOUT) public void verifySessionCharts() throws Exception { pageVisit.visitDirectPage(PageCommandAdminConstants.COMMAND_APPLICATION_SESSION_CHARTS); diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/admin/operations/AdminOperationsTest.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/admin/operations/AdminOperationsTest.java index 045a9d0167..8c494fde5a 100644 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/admin/operations/AdminOperationsTest.java +++ b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/admin/operations/AdminOperationsTest.java @@ -2,16 +2,23 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -import org.openqa.selenium.WebElement; import com.hack23.cia.systemintegrationtest.admin.AbstractAdminTest; import com.hack23.cia.systemintegrationtest.categories.IntegrationTest; import com.hack23.cia.web.impl.ui.application.views.admin.AdminViewConstants; import com.hack23.cia.web.impl.ui.application.views.common.menufactory.api.PageCommandAdminConstants; +/** + * The Class AdminOperationsTest. + */ @Category(IntegrationTest.class) public final class AdminOperationsTest extends AbstractAdminTest { + /** + * Verify agent operation. + * + * @throws Exception the exception + */ @Test(timeout = DEFAULT_TIMEOUT) public void verifyAgentOperation() throws Exception { pageVisit.visitDirectPage(PageCommandAdminConstants.COMMAND_AGENT_OPERATION); @@ -23,6 +30,11 @@ public void verifyAgentOperation() throws Exception { pageVisit.validatePage(PageCommandAdminConstants.COMMAND_AGENT_OPERATION); } + /** + * Verify email operation. + * + * @throws Exception the exception + */ @Test(timeout = DEFAULT_TIMEOUT) public void verifyEmailOperation() throws Exception { pageVisit.visitDirectPage(PageCommandAdminConstants.COMMAND_EMAIL); @@ -30,6 +42,11 @@ public void verifyEmailOperation() throws Exception { pageVisit.validatePage(PageCommandAdminConstants.COMMAND_EMAIL); } + /** + * Verify monitoring operation. + * + * @throws Exception the exception + */ @Test(timeout = DEFAULT_TIMEOUT) public void verifyMonitoringOperation() throws Exception { pageVisit.visitDirectPage(PageCommandAdminConstants.COMMAND_MONITORING); diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/admin/security/AdminSecurityTest.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/admin/security/AdminSecurityTest.java index 22888f3258..7c449fa73f 100644 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/admin/security/AdminSecurityTest.java +++ b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/admin/security/AdminSecurityTest.java @@ -7,43 +7,67 @@ import com.hack23.cia.systemintegrationtest.categories.IntegrationTest; import com.hack23.cia.web.impl.ui.application.views.admin.AdminViewConstants; import com.hack23.cia.web.impl.ui.application.views.common.menufactory.api.PageCommandAdminConstants; +import com.hack23.cia.web.impl.ui.application.views.common.viewnames.AdminViews; +/** + * The Class UserHomeTest. + */ @Category(IntegrationTest.class) public final class AdminSecurityTest extends AbstractAdminTest { - private static final String ACCESS_DENIED = "Access denied"; - - @Test(timeout = DEFAULT_TIMEOUT) - public void verifyUserAccount() throws Exception { - pageVisit.visitDirectPage(PageCommandAdminConstants.COMMAND_USERACCOUNT); - verifyViewContent( - AdminViewConstants.ADMIN_USER_ACCOUNT_MANAGEMENT, - AdminViewConstants.USER_ACCOUNT_OVERVIEW, - AdminViewConstants.USER_ACCOUNT_MANAGEMENT_DESCRIPTION - ); - pageVisit.selectFirstGridRow(); - pageVisit.validatePage(PageCommandAdminConstants.COMMAND_USERACCOUNT); - } - - @Test(timeout = DEFAULT_TIMEOUT) - public void verifySessionAccess() throws Exception { - pageVisit.visitDirectPage(PageCommandAdminConstants.COMMAND_APPLICATION_SESSION); - pageVisit.verifyPageContent(AdminViewConstants.ADMIN_APPLICATION_SESSION); - pageVisit.selectFirstGridRow(); - pageVisit.validatePage(PageCommandAdminConstants.COMMAND_APPLICATION_SESSION); - } - - @Test(timeout = DEFAULT_TIMEOUT) - public void verifyAnonymousAccess() throws Exception { - pageVisit.logoutUser(); - - pageVisit.visitDirectPage(PageCommandAdminConstants.COMMAND_USERACCOUNT); - pageVisit.verifyPageContent(ACCESS_DENIED); - - pageVisit.visitDirectPage(PageCommandAdminConstants.COMMAND_MONITORING); - pageVisit.verifyPageContent(ACCESS_DENIED); - - pageVisit.visitDirectPage(PageCommandAdminConstants.COMMAND_APPLICATION_CONFIGURATION); - pageVisit.verifyPageContent(ACCESS_DENIED); - } + /** + * Verify user account. + * + * @throws Exception the exception + */ + @Test(timeout = DEFAULT_TIMEOUT) + public void verifyUserAccount() throws Exception { + pageVisit.visitDirectPage(PageCommandAdminConstants.COMMAND_USERACCOUNT); + verifyViewContent(AdminViewConstants.ADMIN_USER_ACCOUNT_MANAGEMENT, AdminViewConstants.USER_ACCOUNT_OVERVIEW, + AdminViewConstants.USER_ACCOUNT_MANAGEMENT_DESCRIPTION); + pageVisit.selectFirstGridRow(); + pageVisit.validatePage(PageCommandAdminConstants.COMMAND_USERACCOUNT); + } + + /** + * Verify session access. + * + * @throws Exception the exception + */ + @Test(timeout = DEFAULT_TIMEOUT) + public void verifySessionAccess() throws Exception { + pageVisit.visitDirectPage(PageCommandAdminConstants.COMMAND_APPLICATION_SESSION); + verifyViewContent(AdminViewConstants.ADMIN_APPLICATION_SESSIONS, AdminViewConstants.SESSION_DETAILS, + AdminViewConstants.SESSION_OVERVIEW); + pageVisit.selectFirstGridRow(); + pageVisit.validatePage(PageCommandAdminConstants.COMMAND_APPLICATION_SESSION); + } + + /** + * Verify anonymous access. + * + * @throws Exception the exception + */ + @Test(timeout = DEFAULT_TIMEOUT) + public void verifyNoAnonymousAccess() throws Exception { + pageVisit.logoutUser(); + + pageVisit.visitDirectPage(PageCommandAdminConstants.COMMAND_USERACCOUNT); + pageVisit.verifyPageContent(AdminViewConstants.ACCESS_DENIED + AdminViews.ADMIN_USERACCOUNT_VIEW_NAME); + + pageVisit.visitDirectPage(PageCommandAdminConstants.COMMAND_MONITORING); + pageVisit.verifyPageContent(AdminViewConstants.ACCESS_DENIED + AdminViews.ADMIN_MONITORING_VIEW_NAME); + + pageVisit.visitDirectPage(PageCommandAdminConstants.COMMAND_APPLICATION_CONFIGURATION); + pageVisit.verifyPageContent(AdminViewConstants.ACCESS_DENIED + AdminViews.ADMIN_APPLICATIONS_CONFIGURATION_VIEW_NAME); + + pageVisit.visitDirectPage(PageCommandAdminConstants.COMMAND_AGENT_OPERATION); + pageVisit.verifyPageContent(AdminViewConstants.ACCESS_DENIED + AdminViews.ADMIN_AGENT_OPERATIONVIEW_NAME); + + pageVisit.visitDirectPage(PageCommandAdminConstants.COMMAND_AUTHOR_DATASUMMARY); + pageVisit.verifyPageContent(AdminViewConstants.ACCESS_DENIED + AdminViews.ADMIN_DATA_SUMMARY_VIEW_NAME); + + + } + } diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/categories/IntegrationTest.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/categories/IntegrationTest.java index d4131af29a..e1746e425f 100644 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/categories/IntegrationTest.java +++ b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/categories/IntegrationTest.java @@ -1,7 +1,7 @@ package com.hack23.cia.systemintegrationtest.categories; /** - * Marker interface for integration tests + * Marker interface for integration tests. */ public interface IntegrationTest { } diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/suites/IntegrationTestSuite.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/suites/IntegrationTestSuite.java index 8ea9a24c22..506ab1baaa 100644 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/suites/IntegrationTestSuite.java +++ b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/suites/IntegrationTestSuite.java @@ -8,6 +8,9 @@ import com.hack23.cia.systemintegrationtest.admin.operations.AdminOperationsTest; import com.hack23.cia.systemintegrationtest.admin.security.AdminSecurityTest; +/** + * The Class IntegrationTestSuite. + */ @RunWith(Suite.class) @Suite.SuiteClasses({ // Admin Tests only - remove other test references that don't exist diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/ui/ClickHelper.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/ui/ClickHelper.java index 6be39fba19..1cb6171bfb 100644 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/ui/ClickHelper.java +++ b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/ui/ClickHelper.java @@ -6,34 +6,68 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Actions; +/** + * The Class ClickHelper. + */ public class ClickHelper { + /** The actions. */ private final Actions actions; + + /** The helper. */ private final UserPageVisitHelper helper; + + /** The enable screen shot. */ public static boolean enableScreenShot = false; + /** + * Instantiates a new click helper. + * + * @param driver the driver + * @param helper the helper + */ public ClickHelper(WebDriver driver, UserPageVisitHelper helper) { this.actions = new Actions(driver); this.helper = helper; } + /** + * Click with retry. + * + * @param element the element + */ public void clickWithRetry(WebElement element) { clickElement(element); } + /** + * Click with delay. + * + * @param element the element + */ public void clickWithDelay(WebElement element) { clickElement(element); } + /** + * Click element. + * + * @param element the element + */ private void clickElement(WebElement element) { + + + + actions.pause(Duration.ofMillis(400)).build().perform(); + actions.pause(Duration.ofMillis(250)) .clickAndHold(helper.refreshElement(element)) .release() .pause(Duration.ofMillis(250)) .perform(); - helper.waitForPageLoad(); + actions.pause(Duration.ofMillis(400)).build().perform(); if(enableScreenShot) { helper.grabScreenshot(); diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/ui/ElementHelper.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/ui/ElementHelper.java index fb6e719fa4..0c4cbf3b26 100644 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/ui/ElementHelper.java +++ b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/ui/ElementHelper.java @@ -10,20 +10,44 @@ import org.openqa.selenium.support.ui.ExpectedConditions; import org.openqa.selenium.support.ui.WebDriverWait; +/** + * The Class ElementHelper. + */ public class ElementHelper { + + /** The driver. */ private final WebDriver driver; + + /** The wait timeout. */ private final Duration waitTimeout; + /** + * Instantiates a new element helper. + * + * @param driver the driver + * @param waitTimeout the wait timeout + */ public ElementHelper(WebDriver driver, Duration waitTimeout) { this.driver = driver; this.waitTimeout = waitTimeout; } + /** + * Wait for clickable. + * + * @param locator the locator + * @return the web element + */ public WebElement waitForClickable(By locator) { return new WebDriverWait(driver, waitTimeout) .until(ExpectedConditions.elementToBeClickable(locator)); } + /** + * Find buttons. + * + * @return the list + */ public List findButtons() { final List buttons = new ArrayList<>(); buttons.addAll(driver.findElements(By.className("v-nativebutton"))); @@ -33,6 +57,12 @@ public List findButtons() { return buttons; } + /** + * Find button by text. + * + * @param text the text + * @return the web element + */ public WebElement findButtonByText(String text) { return findButtons().stream() .filter(button -> matchesButtonText(button, text)) @@ -40,6 +70,13 @@ public WebElement findButtonByText(String text) { .orElse(null); } + /** + * Matches button text. + * + * @param button the button + * @param text the text + * @return true, if successful + */ private boolean matchesButtonText(WebElement button, String text) { final String buttonText = button.getText().trim(); return text.equalsIgnoreCase(buttonText) || buttonText.endsWith(text); diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/ui/StaleElementUtils.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/ui/StaleElementUtils.java index e431cc31bf..312acbd61a 100644 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/ui/StaleElementUtils.java +++ b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/ui/StaleElementUtils.java @@ -15,6 +15,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * The Class StaleElementUtils. + */ public class StaleElementUtils { /** The Constant LOGGER. */ diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/ui/TestConstants.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/ui/TestConstants.java index 7311733e97..ddc46eca46 100644 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/ui/TestConstants.java +++ b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/ui/TestConstants.java @@ -3,23 +3,47 @@ import java.time.Duration; import java.util.UUID; +/** + * The Class TestConstants. + */ public final class TestConstants { + + /** The Constant DEFAULT_TIMEOUT. */ public static final long DEFAULT_TIMEOUT = 25000; + + /** The Constant WAIT_FOR_PAGE_DELAY. */ public static final int WAIT_FOR_PAGE_DELAY = 7500; + + /** The Constant WAIT_FOR_PAGE_ELEMENT. */ public static final Duration WAIT_FOR_PAGE_ELEMENT = Duration.ofMillis(7500); + /** + * Instantiates a new test constants. + */ private TestConstants() { // Prevent instantiation } + /** The Constant DEFAULT_BROWSER. */ public static final String DEFAULT_BROWSER = "chrome"; + /** The Constant ADMIN_EMAIL. */ public static final String ADMIN_EMAIL = "admin@hack23.com"; + + /** The Constant DEFAULT_ADMIN_PASSWORD. */ public static final String DEFAULT_ADMIN_PASSWORD = "Admin4hack23!"; + /** The Constant TEST_EMAIL_DOMAIN. */ public static final String TEST_EMAIL_DOMAIN = "@test.com"; + + /** The Constant DEFAULT_COUNTRY. */ public static final String DEFAULT_COUNTRY = "Sweden"; + /** + * Generate password. + * + * @return the string + */ public static String generatePassword() { return UUID.randomUUID().toString(); } diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/ui/TestUtils.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/ui/TestUtils.java index e409bc962f..fc714da01c 100644 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/ui/TestUtils.java +++ b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/ui/TestUtils.java @@ -7,10 +7,21 @@ import org.passay.EnglishCharacterData; import org.passay.PasswordGenerator; +/** + * The Class TestUtils. + */ public final class TestUtils { + /** + * Instantiates a new test utils. + */ private TestUtils() {} + /** + * Generate password. + * + * @return the string + */ public static String generatePassword() { final List rules = Arrays.asList( new CharacterRule(EnglishCharacterData.UpperCase, 1), diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/ui/UserPageVisit.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/ui/UserPageVisit.java index 985a6198d4..f0998ea0a8 100644 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/ui/UserPageVisit.java +++ b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/ui/UserPageVisit.java @@ -18,6 +18,7 @@ */ package com.hack23.cia.systemintegrationtest.ui; +import java.time.Duration; import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -31,6 +32,7 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Actions; import org.openqa.selenium.support.ui.ExpectedConditions; +import org.openqa.selenium.support.ui.FluentWait; import org.openqa.selenium.support.ui.WebDriverWait; import com.hack23.cia.systemintegrationtest.CitizenIntelligenceAgencyServer; @@ -45,8 +47,10 @@ */ public final class UserPageVisit extends Assert { + /** The system test target admin email. */ protected static String systemTestTargetAdminEmail; + /** The system test target admin password. */ protected static String systemTestTargetAdminPassword; /** The Constant systemTestTargetUrl. */ @@ -74,18 +78,22 @@ public final class UserPageVisit extends Assert { /** The driver. */ final WebDriver driver; + /** The helper. */ private final UserPageVisitHelper helper; + + /** The element helper. */ private final ElementHelper elementHelper; + + /** The click helper. */ private final ClickHelper clickHelper; + + /** The action. */ private final Actions action; /** * Instantiates a new user page visit. * - * @param driver - * the driver - * @param browserType - * the browserType + * @param driver the driver */ public UserPageVisit(final WebDriver driver) { super(); @@ -96,13 +104,19 @@ public UserPageVisit(final WebDriver driver) { action = new Actions(driver); } + /** + * Change password. + * + * @param password the password + * @param newPassword the new password + * @param repeatNewPassword the repeat new password + */ public void changePassword(final String password, final String newPassword, final String repeatNewPassword) { setFieldValue("Change password.currentPassword", password); setFieldValue("Change password.newPassword", newPassword); setFieldValue("Change password.repeatNewPassword", repeatNewPassword); - final WebElement button = elementHelper.waitForClickable(By.id("Change password")); - clickHelper.clickWithRetry(button); + clickHelper.clickWithRetry(findButton("Change password")); } /** @@ -113,10 +127,9 @@ public void changePassword(final String password, final String newPassword, fina * @return true, if successful */ public boolean checkHtmlBodyContainsText(final String text) { - final WebDriverWait wait = new WebDriverWait(driver, TestConstants.WAIT_FOR_PAGE_ELEMENT); + final FluentWait wait = new WebDriverWait(driver, TestConstants.WAIT_FOR_PAGE_ELEMENT).pollingEvery(Duration.ofMillis(10)); wait.until(helper.containsViewAction(ViewAction.VISIT_MAIN_VIEW)); - wait.until(helper.containsText(this, text)); - return true; + return getHtmlBodyAsText().contains(text); } /** @@ -126,7 +139,7 @@ public boolean checkHtmlBodyContainsText(final String text) { * the expected value */ public void checkNotificationMessage(final String expectedValue) { - final WebDriverWait wait = new WebDriverWait(driver, TestConstants.WAIT_FOR_PAGE_ELEMENT); + final FluentWait wait = new WebDriverWait(driver, TestConstants.WAIT_FOR_PAGE_ELEMENT).pollingEvery(Duration.ofMillis(10)); wait.until(ExpectedConditions.visibilityOfElementLocated(By.className("v-Notification"))); final WebElement notification = driver.findElement(By.className("v-Notification")); assertNotNull(notification); @@ -145,6 +158,11 @@ public void closeModal() { } + /** + * Disable google authenticator. + * + * @param password the password + */ public void disableGoogleAuthenticator(final String password) { setFieldValue("Disable Google Authenticator.userpassword", password); @@ -154,6 +172,11 @@ public void disableGoogleAuthenticator(final String password) { performClickActionWithRetry(enableGoogleAuthButton); } + /** + * Delete account. + * + * @param password the password + */ public void deleteAccount(final String password) { setFieldValue("Delete Account.userpassword", password); @@ -166,8 +189,7 @@ public void deleteAccount(final String password) { /** * Enable google authenticator. * - * @throws Exception - * the exception + * @param password the password */ public void enableGoogleAuthenticator(final String password) { @@ -187,7 +209,7 @@ public void enableGoogleAuthenticator(final String password) { * @return the web element */ public WebElement findButton(final String buttonLabel) { - final WebDriverWait wait = new WebDriverWait(driver, TestConstants.WAIT_FOR_PAGE_ELEMENT); + final FluentWait wait = new WebDriverWait(driver, TestConstants.WAIT_FOR_PAGE_ELEMENT).pollingEvery(Duration.ofMillis(10)); wait.until(helper.containsButton(buttonLabel)); for (final WebElement webElement : helper.getButtons()) { @@ -201,8 +223,15 @@ public WebElement findButton(final String buttonLabel) { return null; } + /** + * Find clickable. + * + * @param id the id + * @return the web element + */ private WebElement findClickable(final String id) { - final WebDriverWait wait = new WebDriverWait(driver, TestConstants.WAIT_FOR_PAGE_ELEMENT); + final FluentWait wait = new WebDriverWait(driver, TestConstants.WAIT_FOR_PAGE_ELEMENT).pollingEvery(Duration.ofMillis(10)); + wait.pollingEvery(Duration.ofMillis(10)); wait.until(ExpectedConditions.elementToBeClickable(By.id(id))); return driver.findElement(By.id(id)); @@ -277,10 +306,7 @@ protected final void clickFirstRowInGrid(final UserPageVisit userPageVisit) thro /** * Login as admin. * - * @param userPageVisit - * the user page visit - * @throws Exception - * the exception + * @throws Exception the exception */ public final void loginAsAdmin() throws Exception { visitDirectPage( @@ -389,7 +415,7 @@ WebElement getMenuItem(final WebElement element, final int level, final String.. */ public WebElement getMenuItem(final WebElement element, final String... caption) { - final WebDriverWait wait = new WebDriverWait(driver, TestConstants.WAIT_FOR_PAGE_ELEMENT); + final FluentWait wait = new WebDriverWait(driver, TestConstants.WAIT_FOR_PAGE_ELEMENT).pollingEvery(Duration.ofMillis(10)); wait.until(helper.containsMenuItem(this, element, caption)); return getMenuItem(element, 1, caption); @@ -407,6 +433,13 @@ public void loginUser(final String username, final String password) { loginUserCheckView(username, password, UserViews.USERHOME_VIEW_NAME); } + /** + * Login user check view. + * + * @param username the username + * @param password the password + * @param view the view + */ public void loginUserCheckView(final String username, final String password, final String view) { loginUserCheckView(username, password, null, view); } @@ -414,12 +447,10 @@ public void loginUserCheckView(final String username, final String password, fin /** * Login user check view. * - * @param username - * the username - * @param password - * the password - * @param view - * the view + * @param username the username + * @param password the password + * @param otpCode the otp code + * @param view the view */ public void loginUserCheckView(final String username, final String password, final String otpCode, final String view) { @@ -438,7 +469,7 @@ public void loginUserCheckView(final String username, final String password, fin final String url = systemTestTargetUrl + "#!" + view; - final WebDriverWait wait = new WebDriverWait(driver, TestConstants.WAIT_FOR_PAGE_ELEMENT); + final FluentWait wait = new WebDriverWait(driver, TestConstants.WAIT_FOR_PAGE_ELEMENT,(Duration.ofMillis(100))); wait.until(ExpectedConditions.urlContains(url)); assertEquals(url, driver.getCurrentUrl()); @@ -460,7 +491,7 @@ public void logoutUser() { final WebElement body = driver.findElement(By.tagName("body")); body.sendKeys(Keys.ESCAPE); - final WebDriverWait wait = new WebDriverWait(driver, TestConstants.WAIT_FOR_PAGE_ELEMENT); + final FluentWait wait = new WebDriverWait(driver, TestConstants.WAIT_FOR_PAGE_ELEMENT).pollingEvery(Duration.ofMillis(10)); wait.until(helper.containsViewAction(ViewAction.VISIT_MAIN_VIEW)); wait.until(ExpectedConditions.visibilityOfAllElementsLocatedBy(By.tagName("body"))); @@ -481,8 +512,23 @@ public void logoutUser() { final String url = systemTestTargetUrl + "#!" + CommonsViews.MAIN_VIEW_NAME; assertEquals(url, driver.getCurrentUrl()); + cleanBrowser(); + } + + + + + /** + * Clean browser. + */ + private void cleanBrowser() { + if (driver != null) { + driver.manage().deleteAllCookies(); + driver.get("about:blank"); + } } + /** * Perform click action. * @@ -524,6 +570,8 @@ public void registerNewUserCheckView(final String username, final String passwor performClickActionWithRetry(findClickable("Register")); + findButton("Logout"); + if (userView != null) { final String url = systemTestTargetUrl + "#!" + userView; assertEquals(url, driver.getCurrentUrl()); @@ -549,6 +597,13 @@ public void searchDocument(final String search) { } + /** + * Send email on email page. + * + * @param email the email + * @param subject the subject + * @param content the content + */ public void sendEmailOnEmailPage(final String email, final String subject, final String content) { setFieldValue("Email.email", email); @@ -567,7 +622,7 @@ public void sendEmailOnEmailPage(final String email, final String subject, final * the value */ private void setFieldValue(final String id, final String value) { - final WebDriverWait wait = new WebDriverWait(driver, TestConstants.WAIT_FOR_PAGE_ELEMENT); + final FluentWait wait = new WebDriverWait(driver, TestConstants.WAIT_FOR_PAGE_ELEMENT).pollingEvery(Duration.ofMillis(10)); wait.until(ExpectedConditions.elementToBeClickable(By.id(id))); final WebElement findElement = driver.findElement(By.id(id)); @@ -601,7 +656,7 @@ public void updateConfigurationProperty(final String property, final String valu public void validatePage(final PageModeMenuCommand page) { final String url = systemTestTargetUrl + "#!" + page.getPagePath(); - final WebDriverWait wait = new WebDriverWait(driver, TestConstants.WAIT_FOR_PAGE_ELEMENT); + final FluentWait wait = new WebDriverWait(driver, TestConstants.WAIT_FOR_PAGE_ELEMENT).pollingEvery(Duration.ofMillis(10)); wait.until(helper.containsViewAction(ViewAction.VISIT_MAIN_VIEW)); final String text = getHtmlBodyAsText(); @@ -628,23 +683,6 @@ public void verifyViewActions(final ViewAction[] viewActions) { } } - /** - * Visit committee ranking view. - */ - public void VisitCommitteeRankingView() { - final WebElement committeeViewLink = driver.findElement(By - .id(ViewAction.VISIT_COMMITTEE_RANKING_VIEW.name())); - performClickActionWithRetry(committeeViewLink); - - assertEquals("https://localhost:28443/#!committeeranking", - driver.getCurrentUrl()); - - verifyViewActions(new ViewAction[] { ViewAction.VISIT_MAIN_VIEW }); - - final List actionIdsBy = getActionIdsBy(ViewAction.VISIT_COMMITTEE_VIEW); - assertTrue(!actionIdsBy.isEmpty()); - } - /** * Visit direct page. * @@ -656,12 +694,7 @@ public void visitDirectPage(final PageModeMenuCommand page) { driver.get(url); action.pause(500L).perform(); - final WebDriverWait wait = new WebDriverWait(driver, TestConstants.WAIT_FOR_PAGE_ELEMENT); - - wait.until(webDriver -> { - final String readyState = (String) ((JavascriptExecutor) webDriver).executeScript("return document.readyState"); - return "complete".equals(readyState); - }); + final FluentWait wait = new WebDriverWait(driver, TestConstants.WAIT_FOR_PAGE_ELEMENT).pollingEvery(Duration.ofMillis(10)); wait.until(helper.containsViewAction(ViewAction.VISIT_MAIN_VIEW)); @@ -693,55 +726,6 @@ public void visitMainView() { ViewAction.VISIT_COUNTRY_VIEW }); } - /** - * Visit ministry ranking view. - */ - public void VisitMinistryRankingView() { - final WebElement ministryViewLink = driver.findElement(By - .id(ViewAction.VISIT_MINISTRY_RANKING_VIEW.name())); - performClickActionWithRetry(ministryViewLink); - - assertEquals("https://localhost:28443/#!ministryranking", - driver.getCurrentUrl()); - - verifyViewActions(new ViewAction[] { ViewAction.VISIT_MAIN_VIEW }); - - final List actionIdsBy = getActionIdsBy(ViewAction.VISIT_MINISTRY_VIEW); - assertTrue(actionIdsBy.size() > 0); - } - - - /** - * Visit party ranking view. - */ - public void VisitPartyRankingView() { - performClickActionWithRetry(driver.findElement(By - .id(ViewAction.VISIT_PARTY_RANKING_VIEW.name()))); - - assertEquals("https://localhost:28443/#!partyranking", - driver.getCurrentUrl()); - verifyViewActions(new ViewAction[] { ViewAction.VISIT_MAIN_VIEW }); - - final List actionIdsBy = getActionIdsBy(ViewAction.VISIT_PARTY_VIEW); - assertTrue(actionIdsBy.size() > 0); - - } - - - /** - * Visit politician ranking view. - */ - public void VisitPoliticianRankingView() { - final WebElement politiciansViewLink = driver.findElement(By - .id(ViewAction.VISIT_POLITICIAN_RANKING_VIEW.name())); - performClickActionWithRetry(politiciansViewLink); - - assertEquals("https://localhost:28443/#!politicianranking", - driver.getCurrentUrl()); - - verifyViewActions(new ViewAction[] { ViewAction.VISIT_MAIN_VIEW }); - - } /** * Visit start page. @@ -749,7 +733,7 @@ public void VisitPoliticianRankingView() { public void visitStartPage() { driver.get(systemTestTargetUrl); - final WebDriverWait wait = new WebDriverWait(driver, TestConstants.WAIT_FOR_PAGE_ELEMENT); + final FluentWait wait = new WebDriverWait(driver, TestConstants.WAIT_FOR_PAGE_ELEMENT).pollingEvery(Duration.ofMillis(10)); wait.until(helper.containsViewAction(ViewAction.VISIT_MAIN_VIEW)); assertEquals(systemTestTargetUrl, @@ -767,9 +751,15 @@ public void visitStartPage() { ViewAction.VISIT_COUNTRY_VIEW }); } + /** + * Verify page content. + * + * @param expectedContent the expected content + * @return the user page visit + */ public UserPageVisit verifyPageContent(String expectedContent) { try { - assertTrue("Expected content: " + expectedContent, + assertTrue("Expected content: " + expectedContent +"\nNot in:\n " + getHtmlBodyAsText(), checkHtmlBodyContainsText(expectedContent)); return this; } catch (final Exception e) { @@ -777,6 +767,11 @@ public UserPageVisit verifyPageContent(String expectedContent) { } } + /** + * Select first grid row. + * + * @return the user page visit + */ public UserPageVisit selectFirstGridRow() { final WebElement firstRow = getGridRows().get(0); performClickActionWithRetry(firstRow); @@ -784,8 +779,14 @@ public UserPageVisit selectFirstGridRow() { } + /** + * Perform click action with retry. + * + * @param element the element + */ // The public click methods needed by all the calls - public void performClickActionWithRetry(WebElement element) { - clickHelper.clickWithRetry(element); + public void performClickActionWithRetry(WebElement clickElement) { + assertNotNull(clickElement); + clickHelper.clickWithRetry(clickElement); } } diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/ui/UserPageVisitHelper.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/ui/UserPageVisitHelper.java index 67ad8a160a..4748d4d544 100644 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/ui/UserPageVisitHelper.java +++ b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/ui/UserPageVisitHelper.java @@ -12,7 +12,6 @@ import java.util.Set; import org.openqa.selenium.By; -import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.OutputType; import org.openqa.selenium.TakesScreenshot; import org.openqa.selenium.WebDriver; @@ -25,30 +24,45 @@ import com.hack23.cia.web.impl.ui.application.action.ViewAction; +/** + * The Class UserPageVisitHelper. + */ public class UserPageVisitHelper { + + /** The Constant LOG. */ private static final Logger LOG = LoggerFactory.getLogger(UserPageVisitHelper.class); - private static final Duration DEFAULT_WAIT = Duration.ofMillis(120000); + + /** The Constant DEFAULT_WAIT. */ + private static final Duration DEFAULT_WAIT = Duration.ofMillis(100); + + /** The screen shot number. */ private static int screenShotNumber; + /** The driver. */ private final WebDriver driver; + /** + * Instantiates a new user page visit helper. + * + * @param driver the driver + */ UserPageVisitHelper(WebDriver driver) { this.driver = driver; } - public void waitForElement(By locator) { - new WebDriverWait(driver, DEFAULT_WAIT) - .until(ExpectedConditions.elementToBeClickable(locator)); - } + /** + * Wait for page load. + */ public void waitForPageLoad() { - new WebDriverWait(driver, DEFAULT_WAIT) - .until(webDriver -> "complete".equals( - ((JavascriptExecutor) webDriver).executeScript("return document.readyState"))); - new WebDriverWait(driver, DEFAULT_WAIT).until(containsViewAction(ViewAction.VISIT_MAIN_VIEW)); + new WebDriverWait(driver, TestConstants.WAIT_FOR_PAGE_ELEMENT,DEFAULT_WAIT).until(containsViewAction(ViewAction.VISIT_MAIN_VIEW)); + } + /** + * Grab screenshot. + */ public void grabScreenshot() { try { final File scrFile = ((TakesScreenshot) driver).getScreenshotAs(OutputType.FILE); @@ -60,19 +74,42 @@ public void grabScreenshot() { } } + /** + * Refresh element. + * + * @param element the element + * @return the web element + */ public WebElement refreshElement(WebElement element) { return StaleElementUtils.refreshElement(element, driver); } + /** + * Handle interrupted exception. + * + * @param e the e + */ public void handleInterruptedException(InterruptedException e) { Thread.currentThread().interrupt(); throw new RuntimeException("Operation interrupted", e); } + /** + * Element is stale. + * + * @param element the element + * @return the expected condition + */ public ExpectedCondition elementIsStale(WebElement element) { return ExpectedConditions.stalenessOf(element); } + /** + * Contains button. + * + * @param value the value + * @return the expected condition + */ public ExpectedCondition containsButton(final String value) { return new ExpectedCondition<>() { @@ -98,6 +135,14 @@ public String toString() { }; } + /** + * Contains menu item. + * + * @param userPageVisit the user page visit + * @param element the element + * @param caption the caption + * @return the expected condition + */ public ExpectedCondition containsMenuItem(final UserPageVisit userPageVisit, final WebElement element, final String... caption) { return new ExpectedCondition<>() { @Override @@ -108,6 +153,13 @@ public Boolean apply(final WebDriver driver) { }; } + /** + * Contains text. + * + * @param userPageVisit the user page visit + * @param value the value + * @return the expected condition + */ public ExpectedCondition containsText(final UserPageVisit userPageVisit, final String value) { return new ExpectedCondition<>() { @@ -123,6 +175,12 @@ public String toString() { }; } + /** + * Contains view action. + * + * @param value the value + * @return the expected condition + */ public ExpectedCondition containsViewAction(final ViewAction value) { return new ExpectedCondition<>() { @@ -138,6 +196,11 @@ public String toString() { }; } + /** + * Gets the button elements. + * + * @return the button elements + */ List getButtonElements() { final List result = new ArrayList<>(driver.findElements(By.className("v-nativebutton"))); result.addAll(driver.findElements(By.className("v-button"))); @@ -151,12 +214,11 @@ List getButtonElements() { /** * Gets the buttons. * - * @param userPageVisit TODO * @return the buttons */ public List getButtons() { final List result = getButtonElements(); - final WebDriverWait wait = new WebDriverWait(driver, TestConstants.WAIT_FOR_PAGE_ELEMENT); + final WebDriverWait wait = new WebDriverWait(driver, TestConstants.WAIT_FOR_PAGE_ELEMENT,DEFAULT_WAIT); wait.until(ExpectedConditions.refreshed(ExpectedConditions.visibilityOfAllElements(result))); return getButtonElements(); @@ -165,7 +227,6 @@ public List getButtons() { /** * Gets the actions available. * - * @param userPageVisit TODO * @return the actions available */ public Set getActionsAvailable() { @@ -179,4 +240,11 @@ public Set getActionsAvailable() { return actions; } + public void waitForClickable(WebElement element) { + final WebDriverWait wait = new WebDriverWait(driver, TestConstants.WAIT_FOR_PAGE_ELEMENT,DEFAULT_WAIT); + wait.until(ExpectedConditions.elementToBeClickable(StaleElementUtils.refreshElement(element,driver))); + + + } + } diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/ui/WebDriverFactory.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/ui/WebDriverFactory.java index 58c6d5cee6..0e521493a2 100644 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/ui/WebDriverFactory.java +++ b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/ui/WebDriverFactory.java @@ -8,13 +8,28 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * A factory for creating WebDriver objects. + */ public class WebDriverFactory { + + /** The Constant LOG. */ private static final Logger LOG = LoggerFactory.getLogger(WebDriverFactory.class); + + /** The Constant DEFAULT_TIMEOUT. */ private static final Duration DEFAULT_TIMEOUT = Duration.ofSeconds(90); + /** + * Instantiates a new web driver factory. + */ private WebDriverFactory() { } + /** + * Creates a new WebDriver object. + * + * @return the web driver + */ public static WebDriver createDriver() { LOG.info("Creating WebDriver for browser"); final WebDriver driver = createChromeDriver(); @@ -22,6 +37,11 @@ public static WebDriver createDriver() { return driver; } + /** + * Creates a new WebDriver object. + * + * @return the web driver + */ private static WebDriver createChromeDriver() { final ChromeOptions options = new ChromeOptions(); options.addArguments( @@ -30,6 +50,11 @@ private static WebDriver createChromeDriver() { return new ChromeDriver(options); } + /** + * Configure driver. + * + * @param driver the driver + */ private static void configureDriver(WebDriver driver) { driver.manage().timeouts().pageLoadTimeout(DEFAULT_TIMEOUT); driver.manage().timeouts().scriptTimeout(DEFAULT_TIMEOUT); diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/auth/UserAuthenticationTest.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/auth/UserAuthenticationTest.java deleted file mode 100644 index 78cbf27d17..0000000000 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/auth/UserAuthenticationTest.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.hack23.cia.systemintegrationtest.user.auth; - - -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import com.hack23.cia.systemintegrationtest.AbstractUITest; -import com.hack23.cia.systemintegrationtest.categories.IntegrationTest; -import com.hack23.cia.web.impl.ui.application.views.common.menufactory.api.PageCommandUserConstants; - -@Category(IntegrationTest.class) -public final class UserAuthenticationTest extends AbstractUITest { - - @Test(timeout = DEFAULT_TIMEOUT) - public void verifyLoginFlow() throws Exception { - pageVisit.visitDirectPage(PageCommandUserConstants.COMMAND_LOGIN); - pageVisit.verifyPageContent("Login"); - pageVisit.loginUser("username", "password"); - pageVisit.verifyPageContent("Logged in"); - } - - @Test(timeout = DEFAULT_TIMEOUT) - public void verifyLogoutFlow() throws Exception { - pageVisit.visitDirectPage(PageCommandUserConstants.COMMAND_LOGOUT); - pageVisit.verifyPageContent("Logged out"); - } - - @Test(timeout = DEFAULT_TIMEOUT) - public void verifyAuthenticationFlow() throws Exception { - // Login flow - pageVisit.visitDirectPage(PageCommandUserConstants.COMMAND_LOGIN); - pageVisit.verifyPageContent("Login"); - pageVisit.loginUser("username", "password"); - - // Userhome access after login - pageVisit.visitDirectPage(PageCommandUserConstants.COMMAND_USERHOME); - pageVisit.verifyPageContent("User Home"); - - // Logout flow - pageVisit.visitDirectPage(PageCommandUserConstants.COMMAND_LOGOUT); - pageVisit.verifyPageContent("Logged out"); - } - - // ...existing registration tests... -} diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/auth/UserAuthorizationTest.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/auth/UserAuthorizationTest.java deleted file mode 100644 index 2f62655f1c..0000000000 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/auth/UserAuthorizationTest.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.hack23.cia.systemintegrationtest.user.auth; - -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import com.hack23.cia.systemintegrationtest.AbstractUITest; -import com.hack23.cia.systemintegrationtest.categories.IntegrationTest; -import com.hack23.cia.web.impl.ui.application.action.ViewAction; -import com.hack23.cia.web.impl.ui.application.views.common.menufactory.api.PageCommandAdminConstants; -import com.hack23.cia.web.impl.ui.application.views.common.menufactory.api.PageCommandUserConstants; -import com.hack23.cia.web.impl.ui.application.views.common.pagelinks.api.PageModeMenuCommand; -import com.hack23.cia.web.impl.ui.application.views.common.viewnames.UserHomePageMode; -import com.hack23.cia.web.impl.ui.application.views.common.viewnames.UserViews; - -@Category(IntegrationTest.class) -public final class UserAuthorizationTest extends AbstractUITest { - - @Test(timeout = DEFAULT_TIMEOUT) - public void verifyAdminPageAccess() { - pageVisit.visitDirectPage(PageCommandAdminConstants.COMMAND_AGENT_OPERATION); - pageVisit.verifyPageContent("Access denied"); - - pageVisit.visitDirectPage(PageCommandAdminConstants.COMMAND_AUTHOR_DATASUMMARY); - pageVisit.verifyPageContent("Access denied"); - } - - @Test(timeout = DEFAULT_TIMEOUT) - public void verifyPublicPageAccess() { - pageVisit.visitDirectPage(PageCommandUserConstants.COMMAND_MAINVIEW_OVERVIEW); - pageVisit.verifyPageContent("Welcome"); - - pageVisit.visitDirectPage(PageCommandUserConstants.COMMAND_POLITICIAN_RANKING_OVERVIEW); - pageVisit.verifyPageContent("Politicians"); - } - - @Test(timeout = DEFAULT_TIMEOUT) - public void verifyUserHomeAccess() throws Exception { - pageVisit.visitDirectPage( - new PageModeMenuCommand(UserViews.USERHOME_VIEW_NAME, UserHomePageMode.USER_EVENTS.toString())); - pageVisit.verifyPageContent("Access denied:userhome"); - - pageVisit.visitDirectPage( - new PageModeMenuCommand(UserViews.USERHOME_VIEW_NAME, UserHomePageMode.SECURITY_SETTINGS.toString())); - pageVisit.verifyPageContent("Access denied:userhome"); - } - - @Test(timeout = DEFAULT_TIMEOUT) - public void verifyMainPageAccess() throws Exception { - pageVisit.visitMainView(); - pageVisit.verifyViewActions(new ViewAction[] { ViewAction.VISIT_MAIN_VIEW }); - - pageVisit.visitStartPage(); - pageVisit.verifyPageContent("Citizen Intelligence Agency"); - } -} diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/home/UserHomeTest.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/home/UserHomeTest.java new file mode 100644 index 0000000000..252486f06e --- /dev/null +++ b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/home/UserHomeTest.java @@ -0,0 +1,356 @@ +package com.hack23.cia.systemintegrationtest.user.home; + +import java.util.UUID; + +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.openqa.selenium.WebElement; + +import com.hack23.cia.service.api.action.application.LoginResponse; +import com.hack23.cia.systemintegrationtest.AbstractUITest; +import com.hack23.cia.systemintegrationtest.categories.IntegrationTest; +import com.hack23.cia.systemintegrationtest.ui.TestUtils; +import com.hack23.cia.systemintegrationtest.ui.UserPageVisit; +import com.hack23.cia.web.impl.ui.application.views.common.menufactory.api.MenuItemConstants; +import com.hack23.cia.web.impl.ui.application.views.common.menufactory.api.PageCommandUserConstants; +import com.hack23.cia.web.impl.ui.application.views.common.viewnames.ApplicationPageMode; +import com.hack23.cia.web.impl.ui.application.views.pageclicklistener.ChangePasswordClickListener; + +/** + * The Class UserHomeTest. + */ +@Category(IntegrationTest.class) +public final class UserHomeTest extends AbstractUITest { + + + /** + * Site login user change password failure test. + * + * @throws Exception the exception + */ + @Test(timeout = DEFAULT_TIMEOUT) + public void siteLoginUserChangePasswordFailureTest() throws Exception { + pageVisit.visitDirectPage(PageCommandUserConstants.COMMAND_REGISTER); + final String username = UUID.randomUUID().toString(); + final String password = TestUtils.generatePassword(); + + pageVisit.registerNewUser(username, password); + + final WebElement userAccountMenuItem = pageVisit.getMenuItem(MenuItemConstants.USERACCOUNT); + assertNotNull(userAccountMenuItem); + pageVisit.performClickAction(userAccountMenuItem); + + final WebElement securitySettingMenuItem = pageVisit.getMenuItem(MenuItemConstants.SECURITY_SETTING_TEXT); + assertNotNull(securitySettingMenuItem); + pageVisit.performClickAction(securitySettingMenuItem); + + pageVisit.changePassword("wrong" + password,"new"+ password,"new" + password); + + pageVisit.checkNotificationMessage(ChangePasswordClickListener.PROBLEM_CHANGING_PASSWORD); + pageVisit.logoutUser(); + + } + + /** + * Site login user change password test. + * + * @throws Exception the exception + */ + @Test(timeout = DEFAULT_TIMEOUT) + public void siteLoginUserChangePasswordTest() throws Exception { + + pageVisit.visitDirectPage( + PageCommandUserConstants.COMMAND_REGISTER); + + final String username = UUID.randomUUID().toString(); + final String password = TestUtils.generatePassword(); + + pageVisit.registerNewUser(username, password); + + + final WebElement userAccountMenuItem = pageVisit.getMenuItem(MenuItemConstants.USERACCOUNT); + assertNotNull(userAccountMenuItem); + pageVisit.performClickAction(userAccountMenuItem); + + final WebElement securitySettingMenuItem = pageVisit.getMenuItem(MenuItemConstants.SECURITY_SETTING_TEXT); + assertNotNull(securitySettingMenuItem); + pageVisit.performClickAction(securitySettingMenuItem); + + pageVisit.changePassword(password,"new"+ password,"new" + password); + pageVisit.logoutUser(); + } + + + /** + * Site login user check user events test. + * + * @throws Exception + * the exception + */ + @Test(timeout = DEFAULT_TIMEOUT) + public void siteLoginUserCheckUserEventsTest() throws Exception { + + pageVisit.visitDirectPage( + PageCommandUserConstants.COMMAND_REGISTER); + + final String username = UUID.randomUUID().toString(); + final String password = TestUtils.generatePassword(); + + pageVisit.registerNewUser(username, password); + + pageVisit.logoutUser(); + + pageVisit.visitDirectPage(PageCommandUserConstants.COMMAND_LOGIN); + + pageVisit.loginUser(username + "@test.com", password); + + + final WebElement useraccountMenuItem = pageVisit.getMenuItem(MenuItemConstants.USERACCOUNT); + assertNotNull(useraccountMenuItem); + pageVisit.performClickAction(useraccountMenuItem); + + final WebElement userEventsMenuItem = pageVisit.getMenuItem("User Events"); + assertNotNull(userEventsMenuItem); + pageVisit.performClickAction(userEventsMenuItem); + pageVisit.logoutUser(); + } + + /** + * Site login user check user visits test. + * + * @throws Exception + * the exception + */ + @Test(timeout = DEFAULT_TIMEOUT) + public void siteLoginUserCheckUserVisitsTest() throws Exception { + pageVisit.visitDirectPage( + PageCommandUserConstants.COMMAND_REGISTER); + + final String username = UUID.randomUUID().toString(); + final String password = TestUtils.generatePassword(); + + pageVisit.registerNewUser(username, password); + + pageVisit.logoutUser(); + + + pageVisit.visitDirectPage( + PageCommandUserConstants.COMMAND_LOGIN); + + pageVisit.loginUser(username + "@test.com", password); + + + final WebElement useraccountMenuItem = pageVisit.getMenuItem(MenuItemConstants.USERACCOUNT); + assertNotNull(useraccountMenuItem); + pageVisit.performClickAction(useraccountMenuItem); + + final WebElement userVisitsMenuItem = pageVisit.getMenuItem("User Visits"); + assertNotNull(userVisitsMenuItem); + pageVisit.performClickAction(userVisitsMenuItem); + pageVisit.logoutUser(); + } + + @Test(timeout = DEFAULT_TIMEOUT) + public void siteLoginUserDisableGoogleAuthenticatorFailureTest() throws Exception { + pageVisit.visitDirectPage( + PageCommandUserConstants.COMMAND_REGISTER); + + final String username = UUID.randomUUID().toString(); + final String password = TestUtils.generatePassword(); + + pageVisit.registerNewUser(username, password); + + final WebElement userAccountMenuItem = pageVisit.getMenuItem(MenuItemConstants.USERACCOUNT); + assertNotNull(userAccountMenuItem); + pageVisit.performClickAction(userAccountMenuItem); + + final WebElement securitySettingMenuItem = pageVisit.getMenuItem(MenuItemConstants.SECURITY_SETTING_TEXT); + assertNotNull(securitySettingMenuItem); + pageVisit.performClickAction(securitySettingMenuItem); + + pageVisit.disableGoogleAuthenticator("wrong" + password); + + pageVisit.checkNotificationMessage("Problem disable google authenticatorError message"); + pageVisit.logoutUser(); + } + + @Test(timeout = DEFAULT_TIMEOUT) + public void siteLoginUserDisableGoogleAuthenticatorTest() throws Exception { + + pageVisit.visitDirectPage( + PageCommandUserConstants.COMMAND_REGISTER); + + final String username = UUID.randomUUID().toString(); + final String password = TestUtils.generatePassword(); + + pageVisit.registerNewUser(username, password); + + + final WebElement userAccountMenuItem = pageVisit.getMenuItem(MenuItemConstants.USERACCOUNT); + assertNotNull(userAccountMenuItem); + pageVisit.performClickAction(userAccountMenuItem); + + final WebElement securitySettingMenuItem = pageVisit.getMenuItem(MenuItemConstants.SECURITY_SETTING_TEXT); + assertNotNull(securitySettingMenuItem); + pageVisit.performClickAction(securitySettingMenuItem); + + pageVisit.disableGoogleAuthenticator(password); + pageVisit.logoutUser(); + + } + + @Test(timeout = DEFAULT_TIMEOUT) + public void siteLoginUserEnableGoogleAuthenticatorFailedLoginNoOtpTest() throws Exception { + pageVisit.visitDirectPage( + PageCommandUserConstants.COMMAND_REGISTER); + + final String username = UUID.randomUUID().toString(); + final String password = TestUtils.generatePassword(); + + pageVisit.registerNewUser(username, password); + + final WebElement userAccountMenuItem = pageVisit.getMenuItem(MenuItemConstants.USERACCOUNT); + assertNotNull(userAccountMenuItem); + pageVisit.performClickAction(userAccountMenuItem); + + final WebElement securitySettingMenuItem = pageVisit.getMenuItem(MenuItemConstants.SECURITY_SETTING_TEXT); + assertNotNull(securitySettingMenuItem); + pageVisit.performClickAction(securitySettingMenuItem); + + + pageVisit.enableGoogleAuthenticator(password); + + pageVisit.closeModal(); + + pageVisit.logoutUser(); + + final UserPageVisit failedLoginWrongMfaVisit = new UserPageVisit(driver); + + failedLoginWrongMfaVisit.visitDirectPage(PageCommandUserConstants.COMMAND_LOGIN); + + failedLoginWrongMfaVisit.loginUserCheckView(username + "@test.com", password,"123456","main/" + ApplicationPageMode.LOGIN); + + failedLoginWrongMfaVisit.checkNotificationMessage("Login failed:" + LoginResponse.ErrorMessage.USERNAME_OR_PASSWORD_DO_NOT_MATCH); + } + + @Test(timeout = DEFAULT_TIMEOUT) + public void siteLoginDeleteAccountTest() throws Exception { + pageVisit.visitDirectPage( + PageCommandUserConstants.COMMAND_REGISTER); + + final String username = UUID.randomUUID().toString(); + final String password = TestUtils.generatePassword(); + + pageVisit.registerNewUser(username, password); + + final WebElement userAccountMenuItem = pageVisit.getMenuItem(MenuItemConstants.USERACCOUNT); + assertNotNull(userAccountMenuItem); + pageVisit.performClickAction(userAccountMenuItem); + + final WebElement securitySettingMenuItem = pageVisit.getMenuItem(MenuItemConstants.SECURITY_SETTING_TEXT); + assertNotNull(securitySettingMenuItem); + pageVisit.performClickAction(securitySettingMenuItem); + + + pageVisit.deleteAccount(password); + + final UserPageVisit failedLoginUserDeletedVisit = new UserPageVisit(driver); + + failedLoginUserDeletedVisit.visitDirectPage( + PageCommandUserConstants.COMMAND_LOGIN); + + failedLoginUserDeletedVisit.loginUserCheckView(username + "@test.com", password,"123456","main/" + ApplicationPageMode.LOGIN); + + failedLoginUserDeletedVisit.checkNotificationMessage("Login failed:" + LoginResponse.ErrorMessage.USERNAME_OR_PASSWORD_DO_NOT_MATCH); + } + + @Test(timeout = DEFAULT_TIMEOUT) + public void siteLoginUserEnableGoogleAuthenticatorFailureTest() throws Exception { + + pageVisit.visitDirectPage( + PageCommandUserConstants.COMMAND_REGISTER); + + final String username = UUID.randomUUID().toString(); + final String password = TestUtils.generatePassword(); + + pageVisit.registerNewUser(username, password); + + final WebElement userAccountMenuItem = pageVisit.getMenuItem(MenuItemConstants.USERACCOUNT); + assertNotNull(userAccountMenuItem); + pageVisit.performClickAction(userAccountMenuItem); + + + final WebElement securitySettingMenuItem = pageVisit.getMenuItem(MenuItemConstants.SECURITY_SETTING_TEXT); + assertNotNull(securitySettingMenuItem); + pageVisit.performClickAction(securitySettingMenuItem); + + + pageVisit.enableGoogleAuthenticator("wrong" + password); + + pageVisit.checkNotificationMessage("Problem enable google authenticatorError message"); + } + + + /** + * Site login user enable google authenticator test. + * + * @throws Exception + * the exception + */ + @Test(timeout = DEFAULT_TIMEOUT) + public void siteLoginUserEnableGoogleAuthenticatorTest() throws Exception { + + pageVisit.visitDirectPage( + PageCommandUserConstants.COMMAND_REGISTER); + + final String username = UUID.randomUUID().toString(); + final String password = TestUtils.generatePassword(); + + pageVisit.registerNewUser(username, password); + + + final WebElement userAccountMenuItem = pageVisit.getMenuItem(MenuItemConstants.USERACCOUNT); + assertNotNull(userAccountMenuItem); + pageVisit.performClickAction(userAccountMenuItem); + + final WebElement securitySettingMenuItem = pageVisit.getMenuItem(MenuItemConstants.SECURITY_SETTING_TEXT); + assertNotNull(securitySettingMenuItem); + pageVisit.performClickAction(securitySettingMenuItem); + + pageVisit.enableGoogleAuthenticator(password); + + pageVisit.closeModal(); + } + + + /** + * Site login user wrong password test. + * + * @throws Exception + * the exception + */ + @Test(timeout = DEFAULT_TIMEOUT) + public void siteLoginUserWrongPasswordTest() throws Exception { + + pageVisit.visitDirectPage( + PageCommandUserConstants.COMMAND_REGISTER); + + final String username = UUID.randomUUID().toString(); + final String password = TestUtils.generatePassword(); + + pageVisit.registerNewUser(username, password); + + pageVisit.logoutUser(); + + + pageVisit.visitDirectPage( + PageCommandUserConstants.COMMAND_LOGIN); + + pageVisit.loginUserCheckView(username + "@test.com", "wrongpassword","main/" + ApplicationPageMode.LOGIN); + + pageVisit.checkNotificationMessage("Login failed:" + LoginResponse.ErrorMessage.USERNAME_OR_PASSWORD_DO_NOT_MATCH); + + } + + +} diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/navigation/UserNavigationTest.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/navigation/UserNavigationTest.java deleted file mode 100644 index 3ffa4d1f67..0000000000 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/navigation/UserNavigationTest.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.hack23.cia.systemintegrationtest.user.navigation; - -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import com.hack23.cia.systemintegrationtest.AbstractUITest; -import com.hack23.cia.systemintegrationtest.categories.IntegrationTest; -import com.hack23.cia.web.impl.ui.application.views.common.menufactory.api.PageCommandUserConstants; - -@Category(IntegrationTest.class) -public final class UserNavigationTest extends AbstractUITest { - - @Test(timeout = DEFAULT_TIMEOUT) - public void verifyMainNavigation() throws Exception { - pageVisit.visitDirectPage(PageCommandUserConstants.COMMAND_MAINVIEW_OVERVIEW); - pageVisit.verifyPageContent("Main View"); - - pageVisit.visitDirectPage(PageCommandUserConstants.COMMAND_DASHBOARDVIEW_OVERVIEW); - pageVisit.verifyPageContent("Dashboard"); - } - - @Test(timeout = DEFAULT_TIMEOUT) - public void verifyUserHomeNavigation() throws Exception { - pageVisit.loginAsAdmin(); // Ensure proper access - pageVisit.visitDirectPage(PageCommandUserConstants.COMMAND_USERHOME); - pageVisit.verifyPageContent("User Home"); - } -} diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/views/BallotViewTest.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/views/BallotViewTest.java deleted file mode 100644 index b6b8fa077b..0000000000 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/views/BallotViewTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.hack23.cia.systemintegrationtest.user.views; - -import org.junit.Test; - -import com.hack23.cia.systemintegrationtest.AbstractUITest; -import com.hack23.cia.web.impl.ui.application.views.common.menufactory.api.PageCommandUserConstants; - -public class BallotViewTest extends AbstractUITest { - - @Test(timeout = DEFAULT_TIMEOUT) - public void verifyBallotView() throws Exception { - pageVisit.visitDirectPage(PageCommandUserConstants.COMMAND_MAINVIEW_OVERVIEW); - pageVisit.verifyPageContent("Ballot View"); - pageVisit.validatePage(PageCommandUserConstants.COMMAND_MAINVIEW_OVERVIEW); - } -} diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/views/CountryViewTest.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/views/CountryViewTest.java deleted file mode 100644 index ddc459f84f..0000000000 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/views/CountryViewTest.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.hack23.cia.systemintegrationtest.user.views; - -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import com.hack23.cia.systemintegrationtest.AbstractUITest; -import com.hack23.cia.systemintegrationtest.categories.IntegrationTest; -import com.hack23.cia.web.impl.ui.application.views.common.menufactory.api.PageCommandUserConstants; - -@Category(IntegrationTest.class) -public final class CountryViewTest extends AbstractUITest { - - @Test(timeout = DEFAULT_TIMEOUT) - public void verifyCountryView() throws Exception { - pageVisit.visitDirectPage(PageCommandUserConstants.COMMAND_COUNTRY_RANKING_OVERVIEW); - pageVisit.verifyPageContent("Country Rankings"); - pageVisit.validatePage(PageCommandUserConstants.COMMAND_COUNTRY_RANKING_OVERVIEW); - } -} diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/views/DashboardViewTest.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/views/DashboardViewTest.java deleted file mode 100644 index dca470e917..0000000000 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/views/DashboardViewTest.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.hack23.cia.systemintegrationtest.user.views; - -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import com.hack23.cia.systemintegrationtest.AbstractUITest; -import com.hack23.cia.systemintegrationtest.categories.IntegrationTest; -import com.hack23.cia.web.impl.ui.application.views.common.menufactory.api.PageCommandUserConstants; - -@Category(IntegrationTest.class) -public final class DashboardViewTest extends AbstractUITest { - - @Test(timeout = DEFAULT_TIMEOUT) - public void verifyDashboardView() throws Exception { - pageVisit.visitDirectPage(PageCommandUserConstants.COMMAND_DASHBOARDVIEW_OVERVIEW); - pageVisit.verifyPageContent("Dashboard"); - pageVisit.validatePage(PageCommandUserConstants.COMMAND_DASHBOARDVIEW_OVERVIEW); - } -} \ No newline at end of file diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/views/DocumentViewTest.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/views/DocumentViewTest.java deleted file mode 100644 index fad9b9b420..0000000000 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/views/DocumentViewTest.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hack23.cia.systemintegrationtest.user.views; - -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import com.hack23.cia.systemintegrationtest.AbstractUITest; -import com.hack23.cia.systemintegrationtest.categories.IntegrationTest; -import com.hack23.cia.web.impl.ui.application.views.common.menufactory.api.PageCommandUserConstants; - -@Category(IntegrationTest.class) -public final class DocumentViewTest extends AbstractUITest { - - @Test(timeout = DEFAULT_TIMEOUT) - public void verifyDocumentOverview() throws Exception { - pageVisit.visitDirectPage(PageCommandUserConstants.COMMAND_DOCUMENTS); - pageVisit.verifyPageContent("Document View"); - pageVisit.validatePage(PageCommandUserConstants.COMMAND_DOCUMENTS); - } - - @Test(timeout = DEFAULT_TIMEOUT) - public void verifyDocumentSearch() throws Exception { - pageVisit.visitDirectPage(PageCommandUserConstants.COMMAND_SEARCH_DOCUMENT); - pageVisit.verifyPageContent("Search Documents"); - pageVisit.validatePage(PageCommandUserConstants.COMMAND_SEARCH_DOCUMENT); - } -} diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/views/GovernmentBodyViewTest.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/views/GovernmentBodyViewTest.java deleted file mode 100644 index 39788e5171..0000000000 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/views/GovernmentBodyViewTest.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.hack23.cia.systemintegrationtest.user.views; - -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import com.hack23.cia.systemintegrationtest.AbstractUITest; -import com.hack23.cia.systemintegrationtest.categories.IntegrationTest; -import com.hack23.cia.web.impl.ui.application.views.common.menufactory.api.PageCommandUserConstants; - -@Category(IntegrationTest.class) -public final class GovernmentBodyViewTest extends AbstractUITest { - - @Test(timeout = DEFAULT_TIMEOUT) - public void verifyGovernmentBodyView() throws Exception { - pageVisit.visitDirectPage(PageCommandUserConstants.COMMAND_GOVERNMENT_BODY_RANKING_OVERVIEW); - pageVisit.verifyPageContent("Government Body Rankings"); - pageVisit.validatePage(PageCommandUserConstants.COMMAND_GOVERNMENT_BODY_RANKING_OVERVIEW); - } -} diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/views/ParliamentViewTest.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/views/ParliamentViewTest.java deleted file mode 100644 index 406771bd0e..0000000000 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/views/ParliamentViewTest.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.hack23.cia.systemintegrationtest.user.views; - -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import com.hack23.cia.systemintegrationtest.AbstractUITest; -import com.hack23.cia.systemintegrationtest.categories.IntegrationTest; -import com.hack23.cia.web.impl.ui.application.views.common.menufactory.api.PageCommandUserConstants; - -@Category(IntegrationTest.class) -public final class ParliamentViewTest extends AbstractUITest { - - @Test(timeout = DEFAULT_TIMEOUT) - public void verifyParliamentView() throws Exception { - pageVisit.visitDirectPage(PageCommandUserConstants.COMMAND_PARLIAMENT_RANKING_OVERVIEW); - pageVisit.verifyPageContent("Parliament Rankings"); - pageVisit.validatePage(PageCommandUserConstants.COMMAND_PARLIAMENT_RANKING_OVERVIEW); - } -} diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/views/PartyViewTest.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/views/PartyViewTest.java deleted file mode 100644 index afbd025d6e..0000000000 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/views/PartyViewTest.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.hack23.cia.systemintegrationtest.user.views; - -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import com.hack23.cia.systemintegrationtest.AbstractUITest; -import com.hack23.cia.systemintegrationtest.categories.IntegrationTest; -import com.hack23.cia.web.impl.ui.application.views.common.menufactory.api.PageCommandUserConstants; - -@Category(IntegrationTest.class) -public final class PartyViewTest extends AbstractUITest { - - @Test(timeout = DEFAULT_TIMEOUT) - public void verifyPartyOverview() throws Exception { - pageVisit.visitDirectPage(PageCommandUserConstants.COMMAND_PARTY_RANKING_OVERVIEW); - pageVisit.verifyPageContent("Party Rankings"); - pageVisit.selectFirstGridRow(); - pageVisit.validatePage(PageCommandUserConstants.COMMAND_PARTY_RANKING_OVERVIEW); - } - - @Test(timeout = DEFAULT_TIMEOUT) - public void verifyPartyDataGrid() throws Exception { - pageVisit.visitDirectPage(PageCommandUserConstants.COMMAND_PARTY_RANKING_DATAGRID); - pageVisit.verifyPageContent("Party Data"); - pageVisit.validatePage(PageCommandUserConstants.COMMAND_PARTY_RANKING_DATAGRID); - } -} diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/views/PoliticianViewTest.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/views/PoliticianViewTest.java deleted file mode 100644 index 9152c17103..0000000000 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/views/PoliticianViewTest.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hack23.cia.systemintegrationtest.user.views; - -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import com.hack23.cia.systemintegrationtest.AbstractUITest; -import com.hack23.cia.systemintegrationtest.categories.IntegrationTest; -import com.hack23.cia.web.impl.ui.application.views.common.menufactory.api.PageCommandUserConstants; - -@Category(IntegrationTest.class) -public final class PoliticianViewTest extends AbstractUITest { - - @Test(timeout = DEFAULT_TIMEOUT) - public void verifyPoliticianOverview() throws Exception { - pageVisit.visitDirectPage(PageCommandUserConstants.COMMAND_POLITICIAN_RANKING_OVERVIEW); - pageVisit.verifyPageContent("Politician Rankings"); - pageVisit.validatePage(PageCommandUserConstants.COMMAND_POLITICIAN_RANKING_OVERVIEW); - } - - @Test(timeout = DEFAULT_TIMEOUT) - public void verifyPoliticianDataGrid() throws Exception { - pageVisit.visitDirectPage(PageCommandUserConstants.COMMAND_POLITICIAN_RANKING_DATAGRID); - pageVisit.verifyPageContent("Politician Data"); - pageVisit.validatePage(PageCommandUserConstants.COMMAND_POLITICIAN_RANKING_DATAGRID); - } -} diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/views/SearchViewTest.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/views/SearchViewTest.java deleted file mode 100644 index ff95b5b4b0..0000000000 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/views/SearchViewTest.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.hack23.cia.systemintegrationtest.user.views; - -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import com.hack23.cia.systemintegrationtest.AbstractUITest; -import com.hack23.cia.systemintegrationtest.categories.IntegrationTest; -import com.hack23.cia.web.impl.ui.application.views.common.menufactory.api.PageCommandUserConstants; - -@Category(IntegrationTest.class) -public final class SearchViewTest extends AbstractUITest { - - @Test(timeout = DEFAULT_TIMEOUT) - public void verifySearchDocument() throws Exception { - pageVisit.visitDirectPage(PageCommandUserConstants.COMMAND_SEARCH_DOCUMENT); - pageVisit.verifyPageContent("Search Documents"); - pageVisit.validatePage(PageCommandUserConstants.COMMAND_SEARCH_DOCUMENT); - } -} diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/ComplianceCheckPageItemRendererClickListenerTest.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/ComplianceCheckPageItemRendererClickListenerTest.java index df9c39b7e4..246b81259e 100644 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/ComplianceCheckPageItemRendererClickListenerTest.java +++ b/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/ComplianceCheckPageItemRendererClickListenerTest.java @@ -35,6 +35,9 @@ import com.vaadin.ui.UI; import com.vaadin.ui.renderers.ClickableRenderer.RendererClickEvent; +/** + * The Class ComplianceCheckPageItemRendererClickListenerTest. + */ public class ComplianceCheckPageItemRendererClickListenerTest extends AbstractUnitTest { /** diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/DecisionFlowValueChangeListenerTest.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/DecisionFlowValueChangeListenerTest.java index e23146bda6..e5a6979442 100644 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/DecisionFlowValueChangeListenerTest.java +++ b/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/DecisionFlowValueChangeListenerTest.java @@ -29,6 +29,9 @@ import com.vaadin.navigator.Navigator; import com.vaadin.ui.UI; +/** + * The Class DecisionFlowValueChangeListenerTest. + */ public class DecisionFlowValueChangeListenerTest extends AbstractUnitTest { /** diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/DisableGoogleAuthenticatorCredentialClickListenerTest.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/DisableGoogleAuthenticatorCredentialClickListenerTest.java index f4b11580ff..f73d285ff3 100644 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/DisableGoogleAuthenticatorCredentialClickListenerTest.java +++ b/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/DisableGoogleAuthenticatorCredentialClickListenerTest.java @@ -33,6 +33,9 @@ import com.vaadin.ui.Notification.Type; import com.vaadin.ui.Panel; +/** + * The Class DisableGoogleAuthenticatorCredentialClickListenerTest. + */ public class DisableGoogleAuthenticatorCredentialClickListenerTest extends AbstractUnitTest { /** diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/LogoutClickListenerTest.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/LogoutClickListenerTest.java index 89c6aac1bf..279bc52830 100644 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/LogoutClickListenerTest.java +++ b/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/LogoutClickListenerTest.java @@ -31,6 +31,9 @@ import com.vaadin.ui.Notification.Type; import com.vaadin.ui.Panel; +/** + * The Class LogoutClickListenerTest. + */ public class LogoutClickListenerTest extends AbstractUnitTest { /** diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/ManageUserAccountClickListenerTest.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/ManageUserAccountClickListenerTest.java index e45ecaea2b..3c70943fb0 100644 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/ManageUserAccountClickListenerTest.java +++ b/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/ManageUserAccountClickListenerTest.java @@ -31,6 +31,9 @@ import com.vaadin.ui.Notification.Type; import com.vaadin.ui.Panel; +/** + * The Class ManageUserAccountClickListenerTest. + */ public class ManageUserAccountClickListenerTest extends AbstractUnitTest { /** diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/PageItemPropertyClickListenerTest.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/PageItemPropertyClickListenerTest.java index 921a0a1690..de7ced9f68 100644 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/PageItemPropertyClickListenerTest.java +++ b/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/PageItemPropertyClickListenerTest.java @@ -35,6 +35,9 @@ import com.vaadin.ui.UI; import com.vaadin.ui.renderers.ClickableRenderer.RendererClickEvent; +/** + * The Class PageItemPropertyClickListenerTest. + */ public final class PageItemPropertyClickListenerTest extends AbstractUnitTest { diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/RemoveDataClickListenerTest.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/RemoveDataClickListenerTest.java index a238ec2b34..fe9471dad3 100644 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/RemoveDataClickListenerTest.java +++ b/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/RemoveDataClickListenerTest.java @@ -31,6 +31,9 @@ import com.vaadin.ui.Notification.Type; import com.vaadin.ui.Panel; +/** + * The Class RemoveDataClickListenerTest. + */ public class RemoveDataClickListenerTest extends AbstractUnitTest { /** diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/RuleViolationPageItemRendererClickListenerTest.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/RuleViolationPageItemRendererClickListenerTest.java index a30edb4868..47991fb3a3 100644 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/RuleViolationPageItemRendererClickListenerTest.java +++ b/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/RuleViolationPageItemRendererClickListenerTest.java @@ -33,6 +33,9 @@ import com.vaadin.ui.UI; import com.vaadin.ui.renderers.ClickableRenderer.RendererClickEvent; +/** + * The Class RuleViolationPageItemRendererClickListenerTest. + */ public class RuleViolationPageItemRendererClickListenerTest extends AbstractUnitTest { /** diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/SearchDocumentClickListenerTest.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/SearchDocumentClickListenerTest.java index 2c76301bbd..50e1fc1e4c 100644 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/SearchDocumentClickListenerTest.java +++ b/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/SearchDocumentClickListenerTest.java @@ -31,6 +31,9 @@ import com.vaadin.ui.Notification.Type; import com.vaadin.ui.Panel; +/** + * The Class SearchDocumentClickListenerTest. + */ public class SearchDocumentClickListenerTest extends AbstractUnitTest { /** diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/SendEmailClickListenerTest.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/SendEmailClickListenerTest.java index 6a5e44d2e6..cb710ed086 100644 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/SendEmailClickListenerTest.java +++ b/citizen-intelligence-agency/src/test/java/com/hack23/cia/web/impl/ui/application/views/pageclicklistener/SendEmailClickListenerTest.java @@ -31,6 +31,9 @@ import com.vaadin.ui.Notification.Type; import com.vaadin.ui.Panel; +/** + * The Class SendEmailClickListenerTest. + */ public class SendEmailClickListenerTest extends AbstractUnitTest { /** diff --git a/citizen-intelligence-agency/src/test/resources/logback-test.xml b/citizen-intelligence-agency/src/test/resources/logback-test.xml index 2622aa2eab..63aae0db3d 100644 --- a/citizen-intelligence-agency/src/test/resources/logback-test.xml +++ b/citizen-intelligence-agency/src/test/resources/logback-test.xml @@ -23,7 +23,7 @@ - + @@ -36,7 +36,9 @@ - + + +