Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update page headers and descriptions #6804

Merged
merged 1 commit into from
Dec 9, 2024
Merged

Update page headers and descriptions #6804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions ...iews/user/committee/pagemode/CommitteeCurrentMembersHistoryPageModContentFactoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import com.hack23.cia.model.internal.application.system.impl.ApplicationEventGroup;
import com.hack23.cia.service.api.DataContainer;
import com.hack23.cia.web.impl.ui.application.action.ViewAction;
import com.hack23.cia.web.impl.ui.application.views.common.labelfactory.LabelFactory;
import com.hack23.cia.web.impl.ui.application.views.common.viewnames.CommitteePageMode;
import com.hack23.cia.web.impl.ui.application.views.common.viewnames.UserViews;
import com.hack23.cia.web.impl.ui.application.views.pageclicklistener.PageItemPropertyClickListener;
Expand Down Expand Up @@ -76,7 +75,7 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina
final ViewRiksdagenCommittee viewRiksdagenCommittee = getItem(parameters);
getCommitteeMenuItemFactory().createCommitteeeMenuBar(menuBar, pageId);

LabelFactory.createHeader2Label(panelContent, CURRENT_MEMBERS);
createPageHeader(panel, panelContent, "Committee History " + viewRiksdagenCommittee.getEmbeddedId().getDetail(), "Current Members History", "Tracks and presents historical data about committee members' participation.");

final DataContainer<ViewRiksdagenCommitteeRoleMember, String> committeeRoleMemberDataContainer = getApplicationManager()
.getDataContainer(ViewRiksdagenCommitteeRoleMember.class);
Expand All @@ -87,7 +86,6 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina
ViewRiksdagenCommitteeRoleMember_.detail, ViewRiksdagenCommitteeRoleMember_.active),
CURRENT_MEMBERS, COLUMN_ORDER, HIDE_COLUMNS, LISTENER, null, null);

panel.setCaption(NAME + "::" + COMMITTEE + viewRiksdagenCommittee.getEmbeddedId().getDetail());
getPageActionEventHelper().createPageEvent(ViewAction.VISIT_COMMITTEE_VIEW, ApplicationEventGroup.USER, NAME,
parameters, pageId);
return panelContent;
Expand Down
7 changes: 1 addition & 6 deletions .../user/committee/pagemode/CommitteeDecisionTypeDailySummaryPageModContentFactoryImpl2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import com.hack23.cia.model.internal.application.system.impl.ApplicationEventGroup;
import com.hack23.cia.web.impl.ui.application.action.ViewAction;
import com.hack23.cia.web.impl.ui.application.views.common.chartfactory.api.DecisionChartDataManager;
import com.hack23.cia.web.impl.ui.application.views.common.labelfactory.LabelFactory;
import com.hack23.cia.web.impl.ui.application.views.common.viewnames.CommitteePageMode;
import com.vaadin.ui.Layout;
import com.vaadin.ui.MenuBar;
Expand All @@ -41,9 +40,6 @@
public final class CommitteeDecisionTypeDailySummaryPageModContentFactoryImpl2
extends AbstractCommitteePageModContentFactoryImpl {

/** The Constant DECISION_TYPE_DAILY_SUMMARY. */
private static final String DECISION_TYPE_DAILY_SUMMARY = "Decision Type Daily Summary";

/** The chart data manager. */
@Autowired
private DecisionChartDataManager chartDataManager;
Expand All @@ -66,11 +62,10 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina
final ViewRiksdagenCommittee viewRiksdagenCommittee = getItem(parameters);
getCommitteeMenuItemFactory().createCommitteeeMenuBar(menuBar, pageId);

LabelFactory.createHeader2Label(panelContent, DECISION_TYPE_DAILY_SUMMARY);
createPageHeader(panel, panelContent, "Daily Committee Decisions " + viewRiksdagenCommittee.getEmbeddedId().getDetail() , "Summary of Decision Types", "Displays a summary of daily committee decision-making activity.");

chartDataManager.createDecisionTypeChart(panelContent, viewRiksdagenCommittee.getEmbeddedId().getOrgCode());

panel.setCaption(new StringBuilder().append("Committee Decision Type Daily Summary for ").append(viewRiksdagenCommittee.getEmbeddedId().getDetail()).toString());
getPageActionEventHelper().createPageEvent(ViewAction.VISIT_COMMITTEE_VIEW, ApplicationEventGroup.USER, NAME,
parameters, pageId);
return panelContent;
Expand Down
4 changes: 1 addition & 3 deletions ...ion/views/user/committee/pagemode/CommitteeDocumentActivityPageModContentFactoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import com.hack23.cia.model.internal.application.system.impl.ApplicationEventGroup;
import com.hack23.cia.web.impl.ui.application.action.ViewAction;
import com.hack23.cia.web.impl.ui.application.views.common.chartfactory.api.OrgDocumentChartDataManager;
import com.hack23.cia.web.impl.ui.application.views.common.labelfactory.LabelFactory;
import com.hack23.cia.web.impl.ui.application.views.common.viewnames.CommitteePageMode;
import com.vaadin.ui.Layout;
import com.vaadin.ui.MenuBar;
Expand Down Expand Up @@ -69,12 +68,11 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina
final ViewRiksdagenCommittee viewRiksdagenCommittee = getItem(parameters);
getCommitteeMenuItemFactory().createCommitteeeMenuBar(menuBar, pageId);

LabelFactory.createHeader2Label(panelContent, DOCUMENT_ACTIVITY);
createPageHeader(panel, panelContent, "Committee Documents " + viewRiksdagenCommittee.getEmbeddedId().getDetail() , "Document Activity Overview", "Tracks and visualizes the activity associated with committee documents.");

chartDataManager.createDocumentHistoryChartByOrg(panelContent,
viewRiksdagenCommittee.getEmbeddedId().getOrgCode());

panel.setCaption(NAME + "::" + COMMITTEE + viewRiksdagenCommittee.getEmbeddedId().getDetail());
getPageActionEventHelper().createPageEvent(ViewAction.VISIT_COMMITTEE_VIEW, ApplicationEventGroup.USER, NAME,
parameters, pageId);
return panelContent;
Expand Down
4 changes: 1 addition & 3 deletions ...tion/views/user/committee/pagemode/CommitteeDocumentHistoryPageModContentFactoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import com.hack23.cia.model.internal.application.system.impl.ApplicationEventGroup;
import com.hack23.cia.service.api.DataContainer;
import com.hack23.cia.web.impl.ui.application.action.ViewAction;
import com.hack23.cia.web.impl.ui.application.views.common.labelfactory.LabelFactory;
import com.hack23.cia.web.impl.ui.application.views.common.viewnames.CommitteePageMode;
import com.hack23.cia.web.impl.ui.application.views.common.viewnames.UserViews;
import com.hack23.cia.web.impl.ui.application.views.pageclicklistener.PageItemPropertyClickListener;
Expand Down Expand Up @@ -78,7 +77,7 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina

getCommitteeMenuItemFactory().createCommitteeeMenuBar(menuBar, pageId);

LabelFactory.createHeader2Label(panelContent, DOCUMENT_HISTORY);
createPageHeader(panel, panelContent, "Document History " + viewRiksdagenCommittee.getEmbeddedId().getDetail(), "Committee Document History", "Displays the historical progression of documents managed by committees.");

final DataContainer<ViewRiksdagenPoliticianDocument, String> politicianDocumentDataContainer = getApplicationManager()
.getDataContainer(ViewRiksdagenPoliticianDocument.class);
Expand All @@ -91,7 +90,6 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina
ViewRiksdagenPoliticianDocument_.madePublicDate),
DOCUMENTS, COLUMN_ORDER, HIDE_COLUMNS, LISTENER, null, null);

panel.setCaption(new StringBuilder().append("Committee Document History for ").append(viewRiksdagenCommittee.getEmbeddedId().getDetail()).toString());
getPageActionEventHelper().createPageEvent(ViewAction.VISIT_COMMITTEE_VIEW, ApplicationEventGroup.USER, NAME,
parameters, pageId);
return panelContent;
Expand Down
4 changes: 1 addition & 3 deletions ...cation/views/user/committee/pagemode/CommitteeMemberHistoryPageModContentFactoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import com.hack23.cia.model.internal.application.system.impl.ApplicationEventGroup;
import com.hack23.cia.service.api.DataContainer;
import com.hack23.cia.web.impl.ui.application.action.ViewAction;
import com.hack23.cia.web.impl.ui.application.views.common.labelfactory.LabelFactory;
import com.hack23.cia.web.impl.ui.application.views.common.viewnames.CommitteePageMode;
import com.hack23.cia.web.impl.ui.application.views.common.viewnames.UserViews;
import com.hack23.cia.web.impl.ui.application.views.pageclicklistener.PageItemPropertyClickListener;
Expand Down Expand Up @@ -76,7 +75,7 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina

getCommitteeMenuItemFactory().createCommitteeeMenuBar(menuBar, pageId);

LabelFactory.createHeader2Label(panelContent, MEMBER_HISTORY);
createPageHeader(panel, panelContent, "Member History " + viewRiksdagenCommittee.getEmbeddedId().getDetail(), "Committee Member Participation History", "Analyzes and presents participation trends for committee members.");

final DataContainer<ViewRiksdagenCommitteeRoleMember, String> committeeRoleMemberDataContainer = getApplicationManager()
.getDataContainer(ViewRiksdagenCommitteeRoleMember.class);
Expand All @@ -86,7 +85,6 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina
viewRiksdagenCommittee.getEmbeddedId().getDetail()),
MEMBER_HISTORY, COLUMN_ORDER, HIDE_COLUMNS, LISTENER, null, null);

panel.setCaption(NAME + "::" + COMMITTEE + viewRiksdagenCommittee.getEmbeddedId().getDetail());
getPageActionEventHelper().createPageEvent(ViewAction.VISIT_COMMITTEE_VIEW, ApplicationEventGroup.USER, NAME,
parameters, pageId);
return panelContent;
Expand Down
4 changes: 1 addition & 3 deletions ...application/views/user/committee/pagemode/CommitteeOverviewPageModContentFactoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import com.hack23.cia.model.internal.application.data.committee.impl.ViewRiksdagenCommittee;
import com.hack23.cia.model.internal.application.system.impl.ApplicationEventGroup;
import com.hack23.cia.web.impl.ui.application.action.ViewAction;
import com.hack23.cia.web.impl.ui.application.views.common.labelfactory.LabelFactory;
import com.hack23.cia.web.impl.ui.application.views.common.sizing.ContentRatio;
import com.hack23.cia.web.impl.ui.application.views.common.viewnames.PageMode;
import com.vaadin.ui.Layout;
Expand Down Expand Up @@ -67,7 +66,7 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina

getCommitteeMenuItemFactory().createCommitteeeMenuBar(menuBar, pageId);

LabelFactory.createHeader2Label(panelContent, OVERVIEW);
createPageHeader(panel, panelContent, "Committee Overview " + viewRiksdagenCommittee.getEmbeddedId().getDetail(), "Committee Operations Overview", "Provides an overview of committee operations for decision-making support.");

final Link addCommitteePageLink = getPageLinkFactory().addCommitteePageLink(viewRiksdagenCommittee);
panelContent.addComponent(addCommitteePageLink);
Expand All @@ -85,7 +84,6 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina

panelContent.setExpandRatio(addCommitteePageLink, ContentRatio.SMALL);

panel.setCaption(new StringBuilder().append("Committee Overview for ").append(viewRiksdagenCommittee.getEmbeddedId().getDetail()).toString());
getPageActionEventHelper().createPageEvent(ViewAction.VISIT_COMMITTEE_VIEW, ApplicationEventGroup.USER, NAME,
parameters, pageId);
return panelContent;
Expand Down
3 changes: 2 additions & 1 deletion ...ion/views/user/committee/pagemode/CommitteePageVisitHistoryPageModContentFactoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,10 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina
final ViewRiksdagenCommittee viewRiksdagenCommittee = getItem(parameters);
getCommitteeMenuItemFactory().createCommitteeeMenuBar(menuBar, pageId);

createPageHeader(panel, panelContent, "Committee Visits", "Page Visit History for Committees", "Tracks user interaction with committee pages for analytical purposes.");

createPageVisitHistory(NAME, pageId, panelContent);

panel.setCaption(NAME + "::" + COMMITTEE + viewRiksdagenCommittee.getEmbeddedId().getDetail());
getPageActionEventHelper().createPageEvent(ViewAction.VISIT_COMMITTEE_VIEW, ApplicationEventGroup.USER, NAME,
parameters, pageId);
return panelContent;
Expand Down
4 changes: 2 additions & 2 deletions ...user/committee/pagemode/CommitteeRankingAllCommitteesChartsPageModContentFactoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,15 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina

final String pageId = getPageId(parameters);

createPageHeader(panel, panelContent, "Committee Rankings", "Ranking of All Committees", "Provides comparative rankings for committees based on performance or metrics.");

final HorizontalLayout chartLayout = new HorizontalLayout();
chartLayout.setSizeFull();

chartDataManager.createChartPanel(chartLayout, dataSeriesFactory.createCommitteeChartTimeSeriesAll(), "All");

panelContent.addComponent(chartLayout);

panel.setCaption("All Committees Charts Overview");

getPageActionEventHelper().createPageEvent(ViewAction.VISIT_COMMITTEE_RANKING_VIEW, ApplicationEventGroup.USER,
NAME, parameters, pageId);

Expand Down
4 changes: 1 addition & 3 deletions ...cation/views/user/goverment/pagemode/MinistryCurrentMembersPageModContentFactoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import com.hack23.cia.model.internal.application.system.impl.ApplicationEventGroup;
import com.hack23.cia.service.api.DataContainer;
import com.hack23.cia.web.impl.ui.application.action.ViewAction;
import com.hack23.cia.web.impl.ui.application.views.common.labelfactory.LabelFactory;
import com.hack23.cia.web.impl.ui.application.views.common.viewnames.MinistryPageMode;
import com.hack23.cia.web.impl.ui.application.views.common.viewnames.UserViews;
import com.hack23.cia.web.impl.ui.application.views.pageclicklistener.PageItemPropertyClickListener;
Expand Down Expand Up @@ -73,7 +72,7 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina

getMinistryMenuItemFactory().createMinistryMenuBar(menuBar, pageId);

LabelFactory.createHeader2Label(panelContent, CURRENT_MEMBERS);
createPageHeader(panel, panelContent, "Ministry Members " + viewRiksdagenMinistry.getNameId(), "Current Members of Ministry", "Details the current composition of ministry members.");

final DataContainer<ViewRiksdagenGovermentRoleMember, String> govermentRoleMemberDataContainer = getApplicationManager()
.getDataContainer(ViewRiksdagenGovermentRoleMember.class);
Expand All @@ -84,7 +83,6 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina
ViewRiksdagenGovermentRoleMember_.detail, ViewRiksdagenGovermentRoleMember_.active),
CURRENT_MEMBERS, COLUMN_ORDER, HIDE_COLUMNS, LISTENER, null, null);

panel.setCaption(new StringBuilder().append("Ministry Current Members for ").append(viewRiksdagenMinistry.getNameId()).toString());
getPageActionEventHelper().createPageEvent(ViewAction.VISIT_MINISTRY_VIEW, ApplicationEventGroup.USER, NAME,
parameters, pageId);

Expand Down
4 changes: 1 addition & 3 deletions ...tion/views/user/goverment/pagemode/MinistryDocumentActivityPageModContentFactoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import com.hack23.cia.model.internal.application.system.impl.ApplicationEventGroup;
import com.hack23.cia.web.impl.ui.application.action.ViewAction;
import com.hack23.cia.web.impl.ui.application.views.common.chartfactory.api.OrgDocumentChartDataManager;
import com.hack23.cia.web.impl.ui.application.views.common.labelfactory.LabelFactory;
import com.hack23.cia.web.impl.ui.application.views.common.viewnames.MinistryPageMode;
import com.vaadin.ui.Layout;
import com.vaadin.ui.MenuBar;
Expand Down Expand Up @@ -68,11 +67,10 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina
final ViewRiksdagenMinistry viewRiksdagenMinistry = getItem(parameters);
getMinistryMenuItemFactory().createMinistryMenuBar(menuBar, pageId);

LabelFactory.createHeader2Label(panelContent, DOCUMENT_ACTIVITY);
createPageHeader(panel, panelContent, "Ministry Documents " + viewRiksdagenMinistry.getNameId(), "Document Activity Overview", "Tracks and visualizes the activity associated with ministry documents.");

chartDataManager.createDocumentHistoryChartByOrg(panelContent, viewRiksdagenMinistry.getNameId());

panel.setCaption(NAME + "::" + MINISTRY + viewRiksdagenMinistry.getNameId());
getPageActionEventHelper().createPageEvent(ViewAction.VISIT_MINISTRY_VIEW, ApplicationEventGroup.USER, NAME,
parameters, pageId);

Expand Down
4 changes: 1 addition & 3 deletions ...ation/views/user/goverment/pagemode/MinistryDocumentHistoryPageModContentFactoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import com.hack23.cia.model.internal.application.system.impl.ApplicationEventGroup;
import com.hack23.cia.service.api.DataContainer;
import com.hack23.cia.web.impl.ui.application.action.ViewAction;
import com.hack23.cia.web.impl.ui.application.views.common.labelfactory.LabelFactory;
import com.hack23.cia.web.impl.ui.application.views.common.viewnames.MinistryPageMode;
import com.hack23.cia.web.impl.ui.application.views.common.viewnames.UserViews;
import com.hack23.cia.web.impl.ui.application.views.pageclicklistener.PageItemPropertyClickListener;
Expand Down Expand Up @@ -77,7 +76,7 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina

getMinistryMenuItemFactory().createMinistryMenuBar(menuBar, pageId);

LabelFactory.createHeader2Label(panelContent, DOCUMENT_HISTORY);
createPageHeader(panel, panelContent, "Document History " + viewRiksdagenMinistry.getNameId(), "Ministry Document History", "Displays the historical progression of documents managed by ministries.");

final DataContainer<ViewRiksdagenPoliticianDocument, String> politicianDocumentDataContainer = getApplicationManager()
.getDataContainer(ViewRiksdagenPoliticianDocument.class);
Expand All @@ -87,7 +86,6 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina
viewRiksdagenMinistry.getNameId(), ViewRiksdagenPoliticianDocument_.madePublicDate),
DOCUMENTS, COLUMN_ORDER, HIDE_COLUMNS, LISTENER, null, null);

panel.setCaption(new StringBuilder().append("Ministry Document History for ").append(viewRiksdagenMinistry.getNameId()).toString());
getPageActionEventHelper().createPageEvent(ViewAction.VISIT_MINISTRY_VIEW, ApplicationEventGroup.USER, NAME,
parameters, pageId);

Expand Down
9 changes: 1 addition & 8 deletions ...ews/user/goverment/pagemode/MinistryGovernmentBodiesExpenditureModContentFactoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import com.hack23.cia.model.internal.application.system.impl.ApplicationEventGroup;
import com.hack23.cia.web.impl.ui.application.action.ViewAction;
import com.hack23.cia.web.impl.ui.application.views.common.chartfactory.api.GovernmentBodyChartDataManager;
import com.hack23.cia.web.impl.ui.application.views.common.labelfactory.LabelFactory;
import com.hack23.cia.web.impl.ui.application.views.common.viewnames.MinistryPageMode;
import com.vaadin.ui.Layout;
import com.vaadin.ui.MenuBar;
Expand All @@ -40,11 +39,6 @@
@Component
public final class MinistryGovernmentBodiesExpenditureModContentFactoryImpl extends AbstractMinistryPageModContentFactoryImpl {

private static final String GOVERNMENT_BODIES = "Government bodies spending";

/** The Constant MINISTRY. */
private static final String MINISTRY = "Ministry:";

@Autowired
private GovernmentBodyChartDataManager governmentBodyChartDataManager;

Expand All @@ -66,12 +60,11 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina
final ViewRiksdagenMinistry viewRiksdagenMinistry = getItem(parameters);
getMinistryMenuItemFactory().createMinistryMenuBar(menuBar, pageId);

LabelFactory.createHeader2Label(panelContent, GOVERNMENT_BODIES);
createPageHeader(panel, panelContent, "Expenditure Analysis " + viewRiksdagenMinistry.getNameId(), "Government Bodies Expenditure Analysis", "Provides detailed expenditure data for government bodies under ministries.");

governmentBodyChartDataManager.createMinistryGovernmentBodyExpenditureSummaryChart(panelContent,
viewRiksdagenMinistry.getNameId());

panel.setCaption(NAME + "::" + MINISTRY + viewRiksdagenMinistry.getNameId());
getPageActionEventHelper().createPageEvent(ViewAction.VISIT_MINISTRY_VIEW, ApplicationEventGroup.USER, NAME,
parameters, pageId);

Expand Down
Loading