Skip to content

Commit 7d60264

Browse files
jdeanquin-dgjdeanquin-dg
committed
merge develop
2 parents 9dc8fcd + 7d0c52d commit 7d60264

File tree

65 files changed

+3947
-643
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+3947
-643
lines changed

‎amp/.classpath‎

Lines changed: 34 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
<classpath>
33
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
44
<attributes>
5-
<attribute name="owner.project.facets" value="java"/>
5+
<attribute name="maven.pomderived" value="true"/>
66
</attributes>
77
</classpathentry>
8-
<classpathentry kind="src" output="WEB-INF/classes" path="WEB-INF/src">
8+
<classpathentry including="**/*.java" kind="src" output="target/classes" path="WEB-INF/src">
99
<attributes>
1010
<attribute name="optional" value="true"/>
1111
<attribute name="maven.pomderived" value="true"/>
1212
</attributes>
1313
</classpathentry>
14-
<classpathentry kind="src" output="WEB-INF/classes" path="gen-src">
14+
<classpathentry kind="src" output="target/classes" path="gen-src">
1515
<attributes>
1616
<attribute name="optional" value="true"/>
1717
<attribute name="maven.pomderived" value="true"/>
@@ -27,8 +27,37 @@
2727
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
2828
<attributes>
2929
<attribute name="maven.pomderived" value="true"/>
30-
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
3130
</attributes>
3231
</classpathentry>
33-
<classpathentry kind="output" path="WEB-INF/classes"/>
32+
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
33+
<attributes>
34+
<attribute name="maven.pomderived" value="true"/>
35+
<attribute name="optional" value="true"/>
36+
</attributes>
37+
</classpathentry>
38+
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
39+
<attributes>
40+
<attribute name="maven.pomderived" value="true"/>
41+
<attribute name="test" value="true"/>
42+
<attribute name="optional" value="true"/>
43+
</attributes>
44+
</classpathentry>
45+
<classpathentry kind="src" path="target/generated-sources/annotations">
46+
<attributes>
47+
<attribute name="optional" value="true"/>
48+
<attribute name="maven.pomderived" value="true"/>
49+
<attribute name="ignore_optional_problems" value="true"/>
50+
<attribute name="m2e-apt" value="true"/>
51+
</attributes>
52+
</classpathentry>
53+
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
54+
<attributes>
55+
<attribute name="optional" value="true"/>
56+
<attribute name="maven.pomderived" value="true"/>
57+
<attribute name="ignore_optional_problems" value="true"/>
58+
<attribute name="m2e-apt" value="true"/>
59+
<attribute name="test" value="true"/>
60+
</attributes>
61+
</classpathentry>
62+
<classpathentry kind="output" path="target/classes"/>
3463
</classpath>

‎amp/.project‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,17 @@
5252
</arguments>
5353
</buildCommand>
5454
<buildCommand>
55-
<name>org.eclipse.m2e.core.maven2Builder</name>
55+
<name>org.springframework.ide.eclipse.core.springbuilder</name>
5656
<arguments>
5757
</arguments>
5858
</buildCommand>
5959
<buildCommand>
60-
<name>org.springframework.ide.eclipse.core.springbuilder</name>
60+
<name>org.zeroturnaround.eclipse.rebelXmlBuilder</name>
6161
<arguments>
6262
</arguments>
6363
</buildCommand>
6464
<buildCommand>
65-
<name>org.zeroturnaround.eclipse.rebelXmlBuilder</name>
65+
<name>org.eclipse.m2e.core.maven2Builder</name>
6666
<arguments>
6767
</arguments>
6868
</buildCommand>
@@ -89,5 +89,14 @@
8989
<arguments>1.0-name-matches-false-false-*.class</arguments>
9090
</matcher>
9191
</filter>
92+
<filter>
93+
<id>1715189241585</id>
94+
<name></name>
95+
<type>30</type>
96+
<matcher>
97+
<id>org.eclipse.core.resources.regexFilterMatcher</id>
98+
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
99+
</matcher>
100+
</filter>
92101
</filteredResources>
93102
</projectDescription>

‎amp/.settings/org.eclipse.core.resources.prefs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
11
eclipse.preferences.version=1
2+
encoding//WEB-INF/src=UTF-8
3+
encoding//src/main/resources=UTF-8
4+
encoding//src/test/java=UTF-8
5+
encoding//src/test/resources=UTF-8
26
encoding/<project>=UTF-8
7+
encoding/gen-src=UTF-8

‎amp/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
2323
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
2424
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
2525
org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
26+
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
2627
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
2728
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
2829
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -66,6 +67,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=igno
6667
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
6768
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
6869
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
70+
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
6971
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
7072
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
7173
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -97,4 +99,6 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
9799
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
98100
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
99101
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
102+
org.eclipse.jdt.core.compiler.processAnnotations=disabled
103+
org.eclipse.jdt.core.compiler.release=disabled
100104
org.eclipse.jdt.core.compiler.source=1.8

‎amp/Dockerfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ RUN --mount=type=cache,target=/root/.npm \
102102
npm ci \
103103
&& npm run build \
104104
&& rm -rf node_modules
105-
106105
FROM maven:3.8.4-jdk-8 as compile-mvn
107106
WORKDIR /tmp/amp
108107
COPY . .

‎amp/TEMPLATE/reamp/modules/ampoffline/download/components/DownloadLinks.jsx‎

Lines changed: 36 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -12,46 +12,46 @@ const REDHAT_LINUX = 'redhat';
1212
const MACINTOSH = 'macintosh';
1313
const LINUX = 'linux';
1414

15-
var DownloadLinks = React.createClass( {
15+
const DownloadLinks = React.createClass({
1616

1717
displayName: '',
1818

19-
getInitialState: function() {
20-
return { data: [] };
19+
getInitialState: function () {
20+
return {data: []};
2121
},
2222

23-
componentDidMount: function() {
24-
fetchJson( this.props.url ).then( installers => this.setState( { data: installers } ) );
23+
componentDidMount: function () {
24+
fetchJson(this.props.url).then(installers => this.setState({data: installers}));
2525
},
2626

2727
_buildLinksTable() {
2828
const links = [];
29-
if ( this.state.data ) {
30-
this.state.data.sort(( i, j ) => i.os > j.os ).map( i => {
31-
links.push( <a href={`${this.props.url}/${i.id}`} >{this._getInstallerName( i.os, i.arch )}</a> );
32-
} );
33-
return ( <ul>
34-
{links.map( (l, j) => ( <li key={j}>{l}</li> ) )}
35-
</ul> );
29+
if (this.state.data) {
30+
this.state.data.sort((i, j) => i.os > j.os).map(i => {
31+
links.push(<a href={`${this.props.url}/${i.id}`}>{this._getInstallerName(i.os, i.arch)}</a>);
32+
});
33+
return (<ul>
34+
{links.map((l, j) => (<li key={j}>{l}</li>))}
35+
</ul>);
3636
} else {
3737
return null;
3838
}
3939
},
4040

41-
_getInstallerName( os, arch ) {
41+
_getInstallerName(os, arch) {
4242
let name = '';
43-
switch ( os ) {
43+
switch (os) {
4444
case WINDOWS:
45-
name = `Windows Vista/7/8/10 - ${arch} ${this.props.translations['amp.offline:bits']}`;
45+
name = `${this.props.translations['amp.offline:windows']} - ${arch} ${this.props.translations['amp.offline:bits']}`;
4646
break;
4747
case DEBIAN_LINUX:
48-
name = `Ubuntu Linux (.deb) - ${arch} ${this.props.translations['amp.offline:bits']}`;
48+
name = `${this.props.translations['amp.offline:ubuntu']} - ${arch} ${this.props.translations['amp.offline:bits']}`;
4949
break;
5050
case REDHAT_LINUX:
51-
name = `RedHat Linux (.rpm) - ${arch} ${this.props.translations['amp.offline:bits']}`;
51+
name = `${this.props.translations['amp.offline:redhat']} - ${arch} ${this.props.translations['amp.offline:bits']}`;
5252
break;
5353
case MAC:
54-
name = `Mac OS - ${arch} ${this.props.translations['amp.offline:bits']}`;
54+
name = `${this.props.translations['amp.offline:mac']} - ${arch} ${this.props.translations['amp.offline:bits']}`;
5555
break;
5656
}
5757
return name;
@@ -62,25 +62,28 @@ var DownloadLinks = React.createClass( {
6262
const arch = os.architecture;
6363
const family = os.family.toLowerCase();
6464
let osNames = null;
65-
if ( family.indexOf( WINDOWS ) > -1 ) {
65+
if (family.indexOf(WINDOWS) > -1) {
6666
osNames = [WINDOWS];
67-
} else if ( family.indexOf( MACINTOSH ) > -1 ) {
67+
} else if (family.indexOf(MACINTOSH) > -1) {
6868
osNames = [MAC];
69-
} else if ( family.indexOf( LINUX ) > -1 ) {
69+
} else if (family.indexOf(LINUX) > -1) {
7070
osNames = [DEBIAN_LINUX, REDHAT_LINUX];
7171
} else {
7272
return [];
7373
}
74-
const installer = this.state.data.filter( i => ( osNames.filter(os => os === i.os).length > 0 && i.arch === arch.toString() ) );
75-
const links = installer.map(i => {
76-
const installerName = this._getInstallerName( i.os, i.arch );
77-
return (<div key={i.id} className="link"><a href={`${this.props.url}/${i.id}`} >{this.props.translations['amp.offline:download']} {i.version} - {installerName}</a></div>);
74+
const installer = this.state.data.filter(i => (osNames.filter(os => os === i.os).length > 0 && i.arch === arch.toString()));
75+
const links = installer.map(i => {
76+
const installerName = this._getInstallerName(i.os, i.arch);
77+
return (<div key={i.id} className="link"><a
78+
href={`${this.props.url}/${i.id}`}>{this.props.translations['amp.offline:download']} {i.version} - {installerName}</a>
79+
</div>);
7880
});
7981
const message = this.props.translations['amp.offline:best-version-message'];
80-
return ( <div className="alert alert-info" role="alert"><span className="info-text">{message}</span>{links}</div> );
82+
return (
83+
<div className="alert alert-info" role="alert"><span className="info-text">{message}</span>{links}</div>);
8184
},
8285

83-
render: function() {
86+
render: function () {
8487
return (
8588
<div>
8689
<div>
@@ -93,13 +96,17 @@ var DownloadLinks = React.createClass( {
9396
</div>
9497
);
9598
}
96-
} );
99+
});
97100

98101
DownloadLinks.translations = {
99102
"amp.offline:download": "Download AMP Offline",
100103
"amp.offline:all-versions": "All installer versions",
101104
"amp.offline:best-version-message": "We have automatically detected which version of the application meets your operating system requirements. Other versions are available below.",
102-
"amp.offline:bits": "bits"
105+
"amp.offline:bits": "bits",
106+
"amp.offline:windows": "Windows 10/11",
107+
"amp.offline:ubuntu": "Ubuntu Linux (.deb)",
108+
"amp.offline:redhat": "RedHat Linux (.rpm)",
109+
"amp.offline:mac": "Mac OS"
103110
};
104111

105112
module.exports = DownloadLinks;

‎amp/TEMPLATE/reamp/modules/ampoffline/download/index.jsx‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,48 +5,48 @@ import { loadTranslations } from "amp/modules/translate";
55
import DownloadLinks from "./components/DownloadLinks.jsx";
66
require('./style.less');
77

8-
var AMPOfflineDownload = React.createClass( {
8+
const translations = {
9+
...DownloadLinks.translations,
10+
"amp.offline:page-title": "Aid Management Platform - Download Offline Client",
11+
"amp.offline:download-title": "Download the Offline Client",
12+
"amp.offline:text": "The AMP Offline application allows you to edit and add activity information to the AMP without having an active internet connection. In order to use the application, you must download and install the compatible version of AMP Offline application from the list of the latest AMP Offline installers. When you run the application for the first time, you must have an active internet connection in order to sync your user data, activity data, and other critical data to the application. After that, you may work offline and sync your data periodically."
13+
};
14+
const AMPOfflineDownload = React.createClass({
915

1016
displayName: 'Download AMPOffline Client',
1117

12-
getInitialState: function() {
13-
return { translations: [] };
18+
getInitialState: function () {
19+
return {translations: []};
1420
},
1521

16-
componentDidMount: function() {
17-
let toTranslate = new AMP.Model( translations ).toJS();
18-
loadTranslations( translations ).then( trns => this.updateTranslations( trns ) );
22+
componentDidMount: function () {
23+
let toTranslate = new AMP.Model(translations).toJS();
24+
loadTranslations(translations).then(trns => this.updateTranslations(trns));
1925
},
2026

21-
render: function() {
27+
render: function () {
2228
return (
2329
<div>
2430
<div className='col-md-5'>
25-
<img src='/TEMPLATE/reamp/modules/ampoffline/download/images/monitor.png' />
31+
<img src='/TEMPLATE/reamp/modules/ampoffline/download/images/monitor.png'/>
2632
</div>
2733
<div className='col-md-7'>
2834
<div className='c'>
2935
<h2>{this.state.translations['amp.offline:download-title']}</h2>
3036
<span>{this.state.translations['amp.offline:text']}</span>
3137
</div>
3238
<div>
33-
<DownloadLinks url={OFFLINE_INSTALLERS} translations={this.state.translations} />
39+
<DownloadLinks url={OFFLINE_INSTALLERS} translations={this.state.translations}/>
3440
</div>
3541
</div>
3642
</div>
3743
);
3844
},
3945

40-
updateTranslations: function( translations ) {
41-
this.setState( { translations: translations } )
46+
updateTranslations: function (translations) {
47+
this.setState({translations: translations})
4248
}
43-
} );
49+
});
4450

45-
var translations = {
46-
...DownloadLinks.translations,
47-
"amp.offline:page-title": "Aid Management Platform - Download Offline Client",
48-
"amp.offline:download-title": "Download the Offline Client",
49-
"amp.offline:text": "The AMP Offline application allows you to edit and add activity information to the AMP without having an active internet connection. In order to use the application, you must download and install the compatible version of AMP Offline application from the list of the latest AMP Offline installers. When you run the application for the first time, you must have an active internet connection in order to sync your user data, activity data, and other critical data to the application. After that, you may work offline and sync your data periodically."
50-
}
5151

5252
module.exports = AMPOfflineDownload;

‎amp/TEMPLATE/reampv2/src/modules/report_generator/actions/stateUIActions.js‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ export const UPDATE_REPORT_DETAILS_TOTALS_ONLY = 'UPDATE_REPORT_DETAILS_TOTALS_O
1010
export const UPDATE_REPORT_DETAILS_FUNDING_GROUPING = 'UPDATE_REPORT_DETAILS_FUNDING_GROUPING';
1111
export const UPDATE_REPORT_DETAILS_ALLOW_EMPTY_FUNDING_COLUMNS = 'UPDATE_REPORT_DETAILS_ALLOW_EMPTY_FUNDING_COLUMNS';
1212
export const UPDATE_REPORT_DETAILS_SPLIT_BY_FUNDING = 'UPDATE_REPORT_DETAILS_SPLIT_BY_FUNDING';
13+
export const UPDATE_PUBLIC_VIEW = 'UPDATE_PUBLIC_VIEW';
14+
export const UPDATE_WORKSPACE_LINKED = 'UPDATE_WORKSPACE_LINKED';
1315
export const UPDATE_REPORT_DETAILS_SHOW_ORIGINAL_CURRENCIES = 'UPDATE_REPORT_DETAILS_SHOW_ORIGINAL_CURRENCIES';
1416
export const UPDATE_REPORT_DETAILS_DESCRIPTION = 'UPDATE_REPORT_DETAILS_DESCRIPTION';
1517
export const UPDATE_REPORT_DETAILS_NAME_MULTILANG = 'UPDATE_REPORT_DETAILS_NAME_MULTILANG';
@@ -90,6 +92,19 @@ export function updateReportDetailsSplitByFunding(payload) {
9092
};
9193
}
9294

95+
export function updatePublicView(payload) {
96+
return {
97+
type: UPDATE_PUBLIC_VIEW,
98+
payload
99+
};
100+
}
101+
export function updateWorkspaceLinked(payload) {
102+
return {
103+
type: UPDATE_WORKSPACE_LINKED,
104+
payload
105+
};
106+
}
107+
93108
export function updateReportDetailsShowOriginalCurrencies(payload) {
94109
return {
95110
type: UPDATE_REPORT_DETAILS_SHOW_ORIGINAL_CURRENCIES,

0 commit comments

Comments
 (0)