← Back to team overview

dhis2-devs team mailing list archive

Re: [Branch ~dhis2-devs-core/dhis2/trunk] Rev 1855: (GIS) Line chart for several periods implemented.

 

Hm...does not look good from a licensing point of view, I'm afraid,
since we want this to be used by both governments and anyone else. I
think we must try and find another alternative
http://www.highcharts.com/license

Knut

On Fri, May 14, 2010 at 2:26 PM, Jan Henrik Øverland
<janhenrik.overland@xxxxxxxxx> wrote:
> The charts included in Ext3 require a Flash plugin. Thus I decided to use
> Highcharts (http://www.highcharts.com) instead, which is pure JavaScript and
> afaik wouldn't cause any licence issues. Would be nice if the licence gurus
> could have a look, tho.
>
>
> On Fri, May 14, 2010 at 1:59 PM, <noreply@xxxxxxxxxxxxx> wrote:
>>
>> Merge authors:
>>  Jan Henrik Øverland (janhenrik-overland)
>> ------------------------------------------------------------
>> revno: 1855 [merge]
>> committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
>> branch nick: trunk
>> timestamp: Fri 2010-05-14 13:57:55 +0200
>> message:
>>  (GIS) Line chart for several periods implemented.
>> added:
>>  dhis-2/dhis-support/dhis-support-i18n/
>>
>>  dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapValuesByMapAndFeatureIdAction.java
>>
>>  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/highcharts/
>>
>>  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/highcharts/Ext.ux.HighChart.js
>>
>>  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/highcharts/adapter-extjs.js
>>
>>  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/highcharts/highcharts.js
>> modified:
>>
>>  dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedMapValue.java
>>  dhis-2/dhis-api/src/main/java/org/hisp/dhis/datamart/DataMartStore.java
>>  dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingService.java
>>
>>  dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/jdbc/JdbcDataMartStore.java
>>
>>  dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java
>>
>>  dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedMapValueRowMapper.java
>>
>>  dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapValuesByLevelAction.java
>>
>>  dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapValuesByMapAction.java
>>
>>  dhis-2/dhis-web/dhis-web-mapping/src/main/resources/META-INF/dhis/beans.xml
>>  dhis-2/dhis-web/dhis-web-mapping/src/main/resources/struts.xml
>>
>>  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonAggregatedMapValues.vm
>>
>>  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonminAggregatedMapValues.vm
>>
>>  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/index.html
>>
>>  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js
>>
>>  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/Shortcuts.js
>> The size of the diff (1923 lines) is larger than your specified limit of
>> 1000 lines
>>
>> --
>> lp:dhis2
>> https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
>>
>> Your team DHIS 2 developers is subscribed to branch lp:dhis2.
>> To unsubscribe from this branch go to
>> https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
>>
>> _______________________________________________
>> Mailing list: https://launchpad.net/~dhis2-devs
>> Post to     : dhis2-devs@xxxxxxxxxxxxxxxxxxx
>> Unsubscribe : https://launchpad.net/~dhis2-devs
>> More help   : https://help.launchpad.net/ListHelp
>
>
> _______________________________________________
> Mailing list: https://launchpad.net/~dhis2-devs
> Post to     : dhis2-devs@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~dhis2-devs
> More help   : https://help.launchpad.net/ListHelp
>
>



-- 
Cheers,
Knut Staring



Follow ups

References