Skip to content

AMP-30706 - Global partnership reports not loads #4114

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

Merged
merged 3 commits into from
Sep 19, 2023
Merged

AMP-30706 - Global partnership reports not loads #4114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5eeda1
AMP-30706 - Global partnership reports not loads
drossi-dg Sep 13, 2023
7f37691
AMP-30706 - Global partnership reports not loads
drossi-dg Sep 13, 2023
1067d18
AMP-30706 - Global partnership reports not loads
drossi-dg Sep 14, 2023
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
1 change: 1 addition & 0 deletions amp/TEMPLATE/reamp/modules/gpi-reports/common/Constants.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ export const CALENDAR_SETTING = 'calendar-id';
export const ETH_BASE_CALENDAR = 'ETH-CAL';
export const GREG_BASE_CALENDAR = 'GREG-CAL';
export const EP_DATE_FORMAT = 'YYYY-MM-DD';
export const CALENDAR_IS_FISCAL = 'is-fiscal';

export const NATIONAL_BUDGET_EXECUTION_PROCEDURES = 'National Budget Execution Procedures';
export const NATIONAL_FINANCIAL_REPORTING_PROCEDURES = 'National Financial Reporting Procedures';
Expand Down
2 changes: 1 addition & 1 deletion amp/TEMPLATE/reamp/modules/gpi-reports/common/Utils.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ class Utils {
static getCalendarPrefix(settingsWidget, calendars, translatedFY){
const fiscalYear = translatedFY ? translatedFY : Constants.FY;
const cal = calendars.filter( calendar => calendar.id == Utils.getCalendarId(settingsWidget) )[0];
return cal.isFiscal ? fiscalYear + ' ' : '';
return cal[Constants.CALENDAR_IS_FISCAL] ? fiscalYear + ' ' : '';
}


Expand Down
16 changes: 16 additions & 0 deletions amp/TEMPLATE/reamp/modules/gpi-reports/components/HeaderToolTip.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import React, { Component } from 'react';
import { Tooltip, OverlayTrigger } from 'react-bootstrap';
import { IMG_VALUE } from '../common/Constants';
import {bindActionCreators} from "redux";
import {connect} from "react-redux";


class HeaderToolTip extends Component {
Expand Down Expand Up @@ -39,3 +41,17 @@ import { IMG_VALUE } from '../common/Constants';
);
}
}


function mapStateToProps( state, ownProps ) {
return {
translations: state.startUp.translations,
translate: state.startUp.translate
}
}

function mapDispatchToProps( dispatch ) {
return {actions: bindActionCreators({}, dispatch)}
}

export default connect( mapStateToProps, mapDispatchToProps )( HeaderToolTip );
Loading