Skip to content

Commit

Permalink
Merge pull request #35 from eea/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
gabmnic authored Oct 25, 2024
2 parents 20feb85 + cd309dd commit d36d808
Show file tree
Hide file tree
Showing 31 changed files with 1,082 additions and 413 deletions.
41 changes: 40 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,46 @@ All notable changes to this project will be documented in this file. Dates are d

Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

### [1.8.10](https://github.com/eea/eionet2-dashboard/compare/1.8.9...1.8.10) - 30 May 2024
### [2.0.0](https://github.com/eea/eionet2-dashboard/compare/1.8.10...2.0.0) - 25 October 2024

#### :rocket: New Features

- feat: nfp user invite (Refs #278720) [Mihai Nicolae - [`2c78d72`](https://github.com/eea/eionet2-dashboard/commit/2c78d7215eda3b9e68faa0ec228d0ad7e750f44e)]
- feat: improvements (Refs #278720) [Mihai Nicolae - [`e70baee`](https://github.com/eea/eionet2-dashboard/commit/e70baee4ea1e8bd1c78a4691b8da12c40e52ac43)]
- feat: documents data At a glance (Refs #278720) [Mihai Nicolae - [`823fc03`](https://github.com/eea/eionet2-dashboard/commit/823fc03f12e8b3ad75cb5b96acf7a77f9b0d3949)]
- feat: ics improvements (#273595 ) [Mihai Nicolae - [`c1247e9`](https://github.com/eea/eionet2-dashboard/commit/c1247e9d9e60da56921c65cb42521d5827d243e8)]
- feat: change condition for register button(#273601) [danac - [`5d0a29c`](https://github.com/eea/eionet2-dashboard/commit/5d0a29c7c76c7f86e041ba63fc99fe5eab7893c9)]
- feat: user medata and improvements( #267377) [Mihai Nicolae - [`97f9dcc`](https://github.com/eea/eionet2-dashboard/commit/97f9dcc7f1f404e90836728b19f9ec5d8f90d7bf)]
- feat: groups filtering(#271860) [Mihai Nicolae - [`6da2e21`](https://github.com/eea/eionet2-dashboard/commit/6da2e213bdb305e265ed3c0a052db55504353ac3)]
- feat: icon for pcp (#267377) [Mihai Nicolae - [`3c11cff`](https://github.com/eea/eionet2-dashboard/commit/3c11cff8b96eae1c73d4701ec692f913d6f0750f)]
- feat: filter events [Mihai Nicolae - [`64e5e33`](https://github.com/eea/eionet2-dashboard/commit/64e5e33bdf01bde66a6a462fdd55270e70c790c2)]
- feat: filter out working groups(#271860) [Mihai Nicolae - [`f640d88`](https://github.com/eea/eionet2-dashboard/commit/f640d8835ff45be8b1705277a73926ef83ff5947)]
- feat: additional metadata(#267377 ) [Mihai Nicolae - [`9771751`](https://github.com/eea/eionet2-dashboard/commit/97717512d5fbf4b56dd090087139fc4f66248d21)]

#### :bug: Bug Fixes

- fix: correct wrong commit [Mihai Nicolae - [`cfae2c8`](https://github.com/eea/eionet2-dashboard/commit/cfae2c87d9a5615791aadf7ddf6eef5532765e80)]
- fix: small correction [Mihai Nicolae - [`64555e2`](https://github.com/eea/eionet2-dashboard/commit/64555e2646323380532754c268ff73237d4fceeb)]

#### :house: Internal changes

- chore: format [Mihai Nicolae - [`e587432`](https://github.com/eea/eionet2-dashboard/commit/e5874326444b4b68652143ac0908704722942af8)]
- chore: hide invite column [Mihai Nicolae - [`edfb571`](https://github.com/eea/eionet2-dashboard/commit/edfb571f20ad5dd20c6422e6f86ab908a3ad7d19)]
- chore: small manifest correction [Mihai Nicolae - [`2a7cb3c`](https://github.com/eea/eionet2-dashboard/commit/2a7cb3c4803e200b48d0f7bee06e47967ac954d8)]
- chore: fix package.lock [Mihai Nicolae - [`1833532`](https://github.com/eea/eionet2-dashboard/commit/1833532beabe5e666c94ad5ee90cbb0629434b01)]
- chore: version [Mihai Nicolae - [`cebf75a`](https://github.com/eea/eionet2-dashboard/commit/cebf75ad7651502d9ae8ad0c876639198f5b5fae)]
- chore: version [Mihai Nicolae - [`801c980`](https://github.com/eea/eionet2-dashboard/commit/801c9809feb9050683325d931ac5a7dfcc37b349)]
- chore: format [Mihai Nicolae - [`96a2ba4`](https://github.com/eea/eionet2-dashboard/commit/96a2ba486d8841340f5ff3152e75e7ecbc5bdaea)]

#### :hammer_and_wrench: Others

- test: use nodejs16 [valentinab25 - [`a96704e`](https://github.com/eea/eionet2-dashboard/commit/a96704ececc8a82bb090a8ae90e9dd980fd3ce32)]
- test: use nodejs16 [valentinab25 - [`38b88b5`](https://github.com/eea/eionet2-dashboard/commit/38b88b5d125139001496c672f990939c42f9dfa7)]
- format [Mihai Nicolae - [`bd6252c`](https://github.com/eea/eionet2-dashboard/commit/bd6252cfe8cee2149b7ec4928c087c8329463804)]
- ICS improvements [Mihai Nicolae - [`4d176b0`](https://github.com/eea/eionet2-dashboard/commit/4d176b04a88c9a79aa7e00a9582889ca32d13a86)]
- improvement (WIP) [Mihai Nicolae - [`8d8eb76`](https://github.com/eea/eionet2-dashboard/commit/8d8eb760614f76b327a92250335ae89139d53ce7)]
- error simulation [Mihai Nicolae - [`640e5fc`](https://github.com/eea/eionet2-dashboard/commit/640e5fc10b216b85e98a6812283abebb0d0ea057)]
### [1.8.10](https://github.com/eea/eionet2-dashboard/compare/1.8.9...1.8.10) - 3 June 2024

#### :rocket: New Features

Expand Down
18 changes: 17 additions & 1 deletion CONFIGURATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,20 @@ Configuration keys

### [1.8.2]
Configuration keys
- DashboardNoOfDisplayedYears - The numbers of years used in the Country overview to display information about progress.
- DashboardNoOfDisplayedYears - The numbers of years used in the Country overview to display information about progress.

### [1.9.0]
Configuration keys
- EventTypeTooltipHybrid - Text for tooltip displayed on events list on icon for hybrid meetings.
- EventTypeTooltipPhysical - Text for tooltip displayed on events list on icon for physical meetings.
- EventTypeTooltipOnline - Text for tooltip displayed on events list on icon for online meetings.
- DashboardLeadIconTooltip - Text for tooltip displayed for Lead (PCP) in groups grid and self-service.

### [2.0.0]
Configuration keys
- RegisterOthersButtonTooltip - Text for tooltip on Register other button in events list
- InviteOnlineEmailSubject - Subject for email sent for online meeting invite by NFP
- InviteOfflineEmailSubject - Subject for email sent for offline meeting invite by NFP
- InviteOnlineEmailBody - Body for email sent for online meeting invite by NFP
- InviteOfflineEmailBody - Body for email sent for Offline meeting invite by NFP
- EventInvitationByNFPError - Message displayed when NFP tries to invite users that can register themselves for an event
84 changes: 84 additions & 0 deletions DATA.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
## Definitions
- WorkingGroup - group where the name starts with the prefix configured in the WorkingGroupPrefix option in Configuration list


In the following sections are detailed the conditions behind the counters displayed in the At a glance section in the Dashboard.

## Representation section

In this section the information is filtered by country if the country is selected. If not total counts are displayed.

### Members
- Total count of users in the User sharepoint list

- Details link will open the User sharepoint list filtered by country if selected.

### Members pending sing in
- Count of users with SignedIn = false. These users have been invited but have not finalized the sign-in process.

- Details link will open the User sharepoint list filtered by country if selected and by SignedIn = false (0).

### Organisations
- Total count of organisations in the Organisation sharepoint list

- Details link will open the Organisation sharepoint list filtered by country if selected.

### Groups with nominations
- The count of groups with nominations is computed by from the groups that have at least one user in the sharepoint list (signed in or not).

- Total number of groups is computed from the choices available in the membership column in the User sharepoint list excluding WorkingGroups.

### Groups with signed in users
- The count of groups with signed in users is computed by from the groups that have at least one user with SignedIn = true in the sharepoint list. Always should be smaller than the previous count.

- Total number of groups is computed in the same way as in the previous counter.


## Info detailing country progress

This section provides information of the selected country participantion in the events/consultations/enquiries. It is visible only if the country is selected.
The data is diplayed separately per year for the last three years (including current year).

### Consultations
- The total count of consultations is computed using the following condition:

```
Year = selected year
AND Deadline < Today
AND ConsultationType = 'Consultation'
AND IsECConsultation IN (Eionet-and-EC, Eionet-only, N/A)
AND EionetGroups has at least a non WorkingGroup
```
- The number of consultations for which the country has responded is computed with the following condition added to the list obtained with total condition:
```Respondants includes the selected country```
### Enquiries
- The total count of enquiries is computed using the following condition:
```
Year = selected year
AND Deadline < Today
AND ConsultationType = 'Enquiry'
AND IsECConsultation IN (Eionet-and-EC, Eionet-only, N/A)
AND EionetGroups has at least a non WorkingGroup
```
- The number of enquiries for which the country has responded is computed with the following condition added to the list obtained with total condition:
```Respondants includes the selected country```
### Events
- The total count of events is computed using the following condition:
```
Year = selected year
AND Group has at least a non WorkingGroup
AND MeetingEnd < Today
```
- The number of events attended by a user from the selected country is computed with the following condition added to the list obtained with total condition:
```Countries includes the selected country```
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pipeline {
environment {
GIT_NAME = "eionet2-dashboard"
SONARQUBE_TAGS = "eionet2"
PATH = "${tool 'NodeJS'}/bin:${tool 'SonarQubeScanner'}/bin:$PATH"
PATH = "${tool 'NodeJS16'}/bin:${tool 'SonarQubeScanner'}/bin:$PATH"
}
stages{

Expand Down Expand Up @@ -37,7 +37,7 @@ pipeline {
steps {
script{
checkout scm
tool 'NodeJS'
tool 'NodeJS16'
tool 'SonarQubeScanner'
sh "cd tabs; yarn install"
}
Expand Down
Loading

0 comments on commit d36d808

Please sign in to comment.