Skip to content

Commit

Permalink
feat: Add doc activity level, doc activity profile, and collaboration (…
Browse files Browse the repository at this point in the history 
…#6906)

percentage fields in politician overview

- Updated the service statistics section to display:
  - Document Activity Level
  - Document Activity Profile
  - Collaboration Percentage
- Ensured safe checks for null date values in First/Last Assignment Date
- Maintained consistent styling and tooltips in the 'Profile Details'
and 'Service Statistics' layouts
  • Loading branch information
@pethers
pethers authored Dec 27, 2024
1 parent eed95f4 commit 20d279e
Show file tree
Hide file tree
Showing 6 changed files with 1,049 additions and 6 deletions.
2 changes: 2 additions & 0 deletions ...plication/views/user/politician/pagemode/AbstractPoliticianPageModContentFactoryImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

import com.hack23.cia.model.external.riksdagen.person.impl.PersonData;
import com.hack23.cia.model.internal.application.data.politician.impl.ViewRiksdagenPolitician;
import com.hack23.cia.model.internal.application.data.politician.impl.ViewRiksdagenPoliticianBallotSummary;
import com.hack23.cia.web.impl.ui.application.views.common.menufactory.api.PoliticianMenuItemFactory;
import com.hack23.cia.web.impl.ui.application.views.common.pagemode.AbstractItemPageModContentFactoryImpl;
import com.hack23.cia.web.impl.ui.application.views.common.viewnames.UserViews;
Expand Down Expand Up @@ -74,6 +75,7 @@ protected ViewRiksdagenPolitician getItem(final String parameters) {
}
}


/**
* Gets the politician ranking menu item factory.
*
Expand Down
102 changes: 96 additions & 6 deletions ...plication/views/user/politician/pagemode/PoliticianOverviewPageModContentFactoryImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

import com.hack23.cia.model.external.riksdagen.person.impl.PersonData;
import com.hack23.cia.model.internal.application.data.politician.impl.ViewRiksdagenPolitician;
import com.hack23.cia.model.internal.application.data.politician.impl.ViewRiksdagenPoliticianBallotSummary;
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.sizing.ContentRatio;
Expand Down Expand Up @@ -64,6 +65,7 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina

final String pageId = getPageId(parameters);
final ViewRiksdagenPolitician viewRiksdagenPolitician = getItem(parameters);
final ViewRiksdagenPoliticianBallotSummary viewRiksdagenPoliticianBallotSummary = getViewRiksdagenPoliticianBallotSummary(parameters);

getPoliticianMenuItemFactory().createPoliticianMenuBar(menuBar, pageId);

Expand All @@ -79,7 +81,7 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina
final PersonData personData = getApplicationManager().getDataContainer(PersonData.class)
.load(viewRiksdagenPolitician.getPersonId());

createOverviewContent(panelContent, personData, viewRiksdagenPolitician, pageId);
createOverviewContent(panelContent, personData, viewRiksdagenPolitician, viewRiksdagenPoliticianBallotSummary, pageId);

getPageActionEventHelper().createPageEvent(
ViewAction.VISIT_POLITICIAN_VIEW,
Expand All @@ -92,16 +94,29 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina
return panelContent;
}


protected ViewRiksdagenPoliticianBallotSummary getViewRiksdagenPoliticianBallotSummary(final String parameters) {
final String pageId = getPageId(parameters);
final PersonData personData = getApplicationManager().getDataContainer(PersonData.class).load(pageId);
if (personData != null) {
return getApplicationManager().getDataContainer(ViewRiksdagenPoliticianBallotSummary.class).load(personData.getId());
} else {
return null;
}
}


/**
* Creates the overview content in a card style similar to the scoreboard snippet.
*
* @param panelContent the panel content
* @param personData the person data
* @param viewRiksdagenPolitician the view riksdagen politician
* @param viewRiksdagenPoliticianBallotSummary the view riksdagen politician ballot summary
* @param pageId the page id
*/
private void createOverviewContent(final VerticalLayout panelContent, final PersonData personData,
final ViewRiksdagenPolitician viewRiksdagenPolitician, final String pageId) {
final ViewRiksdagenPolitician viewRiksdagenPolitician, final ViewRiksdagenPoliticianBallotSummary viewRiksdagenPoliticianBallotSummary, final String pageId) {

// Link to politician detail page
final Link createPoliticianPageLink = getPageLinkFactory().createPoliticianPageLink(personData);
Expand Down Expand Up @@ -206,14 +221,89 @@ private void createOverviewContent(final VerticalLayout panelContent, final Pers

// Additional stats (Assuming these methods exist)
serviceStatsLayout.addComponent(createInfoRow("Total Assignments:", String.valueOf(viewRiksdagenPolitician.getTotalAssignments()), VaadinIcons.BAR_CHART, "Total number of assignments held"));
serviceStatsLayout.addComponent(createInfoRow("First Assignment Date:", String.valueOf(viewRiksdagenPolitician.getFirstAssignmentDate().toString()), VaadinIcons.FLASH, "First assignment in public service"));
serviceStatsLayout.addComponent(createInfoRow("Last Assignment Date:", String.valueOf(viewRiksdagenPolitician.getLastAssignmentDate().toString()), VaadinIcons.FLASH, "Last assignment in public service"));
serviceStatsLayout.addComponent(createInfoRow("Ministry Assignments:", String.valueOf(viewRiksdagenPolitician.getTotalMinistryAssignments()), VaadinIcons.INSTITUTION, "Number of ministry level assignments"));
serviceStatsLayout.addComponent(createInfoRow("Speaker Assignments:", String.valueOf(viewRiksdagenPolitician.getTotalSpeakerAssignments()), VaadinIcons.MICROPHONE, "Number of speaker assignments"));

// New: Documentation & Collaboration
serviceStatsLayout.addComponent(createInfoRow("Document Activity Level:",
viewRiksdagenPolitician.getDocActivityLevel(),
VaadinIcons.FILE_TEXT_O,
"Indicates the politician's level of engagement in document creation"));

serviceStatsLayout.addComponent(createInfoRow("Document Activity Profile:",
viewRiksdagenPolitician.getDocActivityProfile(),
VaadinIcons.CLIPBOARD_TEXT,
"Detailed classification of document activity"));

serviceStatsLayout.addComponent(createInfoRow("Collaboration Percentage:",
String.valueOf(viewRiksdagenPolitician.getCollaborationPercentage()),
VaadinIcons.GROUP,
"Measure of cross-party collaboration in motions"));

attributesLayout.addComponent(serviceStatsLayout);


if (viewRiksdagenPoliticianBallotSummary != null) {


// A layout to hold the ballot statistics rows
final VerticalLayout ballotStatsLayout = new VerticalLayout();
ballotStatsLayout.setSpacing(true);
ballotStatsLayout.setWidth("100%");
ballotStatsLayout.addStyleName("card-details-column");
attributesLayout.addComponent(ballotStatsLayout);

final Label ballotStatsHeader = new Label("Ballot Statistics");
ballotStatsHeader.addStyleName("card-section-title");
ballotStatsLayout.addComponent(ballotStatsHeader);


// Example rows for Ballot Summary fields
ballotStatsLayout.addComponent(createInfoRow(
"Total Votes:",
String.valueOf(viewRiksdagenPoliticianBallotSummary.getTotalVotes()),
VaadinIcons.SCALE,
"Number of total votes cast by this politician"
));

ballotStatsLayout.addComponent(createInfoRow(
"Absence Rate (%):",
String.valueOf(viewRiksdagenPoliticianBallotSummary.getAbsenceRate()),
VaadinIcons.USER_CLOCK,
"Percentage of votes missed (absence rate)"
));

ballotStatsLayout.addComponent(createInfoRow(
"Rebel Rate (%):",
String.valueOf(viewRiksdagenPoliticianBallotSummary.getRebelRate()),
VaadinIcons.WARNING,
"Percentage of times the politician voted against party line"
));

ballotStatsLayout.addComponent(createInfoRow(
"Last Vote Date:",
viewRiksdagenPoliticianBallotSummary.getLastVoteDate() != null
? viewRiksdagenPoliticianBallotSummary.getLastVoteDate().toString()
: "N/A",
VaadinIcons.CALENDAR_USER,
"Date of the politician's last recorded vote"
));


ballotStatsLayout.addComponent(createInfoRow(
"Voting Consistency Score:",
String.valueOf(viewRiksdagenPoliticianBallotSummary.getVotingConsistencyScore()),
VaadinIcons.BAR_CHART,
"Combined measure of success rate and party-line loyalty"
));

ballotStatsLayout.addComponent(createInfoRow(
"Analysis Comment:",
viewRiksdagenPoliticianBallotSummary.getAnalysisComment(),
VaadinIcons.CLIPBOARD_TEXT,
"Brief textual analysis regarding the politician's voting behavior"
));

}

// After the card, add the overview layout for extended details
final VerticalLayout overviewLayout = new VerticalLayout();
overviewLayout.setSizeFull();
Expand Down
Loading

0 comments on commit 20d279e

Please sign in to comment.