[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16452: PT 'co' bug fixed.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
revno: 16452 [merge]
committer: Jan Henrik Overland janhenrik.overl...@gmail.com
branch nick: dhis2
timestamp: Wed 2014-08-20 11:10:35 +0200
message:
PT 'co' bug fixed.
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/scripts/core.js
--
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
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/scripts/app.js 2014-08-13 15:40:54 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/scripts/app.js 2014-08-20 09:09:22 +
@@ -929,13 +929,13 @@
delete favorite.id;
// Replace operand id characters
-//for (var i = 0; i dimensions.length; i++) {
- //if (dimensions[i].dimension === ns.core.conf.finals.dimension.operand.objectName) {
- //for (var j = 0; j dimensions[i].items.length; j++) {
- //dimensions[i].items[j].id = dimensions[i].items[j].id.replace('-', '.');
- //}
- //}
-//}
+for (var i = 0; i dimensions.length; i++) {
+ if (dimensions[i].dimension === ns.core.conf.finals.dimension.operand.objectName) {
+ for (var j = 0; j dimensions[i].items.length; j++) {
+ dimensions[i].items[j].id = dimensions[i].items[j].id.replace('#', '.');
+ }
+ }
+}
}
return favorite;
@@ -2826,9 +2826,9 @@
data = response.objects || response.dataElementOperands || [],
pager = response.pager;
- //for (var i = 0; i data.length; i++) {
- //data[i].id = data[i].id.split('.').join('-');
- //}
+ for (var i = 0; i data.length; i++) {
+ data[i].id = data[i].id.split('.').join('#');
+ }
store.loadStore(data, pager, append);
}
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/scripts/core.js 2014-08-11 15:07:49 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/scripts/core.js 2014-08-20 09:09:22 +
@@ -247,7 +247,7 @@
return;
}
- config.id = config.id.replace('#', '.');
+ config.id = config.id.replace('.', '#');
return config;
}();
@@ -929,6 +929,7 @@
xDim.ids = [];
for (var j = 0; j items.length; j++) {
+console.log(xl, items[j].id);
xDim.ids.push(items[j].id);
}
}
@@ -1719,8 +1720,8 @@
for (var i = 0, id, splitId ; i ids.length; i++) {
id = ids[i];
- if (id.indexOf('.') !== -1) {
- splitId = id.split('.');
+ if (id.indexOf('#') !== -1) {
+ splitId = id.split('#');
response.metaData.names[id] = response.metaData.names[splitId[0]] + ' ' + response.metaData.names[splitId[1]];
}
}
@@ -1899,7 +1900,7 @@
if (dimName === dx) {
for (var j = 0, index; j items.length; j++) {
- index = items[j].indexOf('.');
+ index = items[j].indexOf('#');
if (index 0) {
addCategoryDimension = true;
@@ -2285,8 +2286,7 @@
uuids = [];
// meta data uid
- //id = (xColAxis ? support.prototype.str.replaceAll(xColAxis.ids[j], '-', '') : '') + (xRowAxis ? support.prototype.str.replaceAll(xRowAxis.ids[i], '-', '') : '');
- id = (xColAxis ? xColAxis.ids[j] : '') + (xRowAxis ? xRowAxis.ids[i] : '');
+ id = ((xColAxis ? xColAxis.ids[j] : '') + (xRowAxis ? xRowAxis.ids[i] : '')).replace('#', '');
// value html element id
uuid = Ext.data.IdGenerator.get('uuid').generate();
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs] dhis upgrade from 2.0.5 to 2.15
The question of upgrading from very old dhis2 versions came up recently in another post. It emerged then that we don't seem to have a historical archive (museum!) of war artefacts going back beyond 2.10 on http://apps.dhis2.org/ci. We do have the source code tagged back as far as 2.4. Has anybody kept hold of these historic build or should we consider rebuilding and making available? Who would volunteer to do that? On 19 August 2014 22:59, Knut Staring knu...@gmail.com wrote: Hi Moemedi, Not sure, but I think you could try upgrading directly from 2.0.5 to 2.13 first, and then run the first script. Then 2.14, then script, then 2.15. If things don't work, you should provide the actual error messages. On Tue, Aug 19, 2014 at 6:17 PM, Moemedi Ntunyane moemedi.ntuny...@hotmail.com wrote: Hi All I am upgrading DHIS 2.0.5 using postgreSQL DB, is there a shortcut other than using incremental way like 2.0.5, 2.0.6 ..to 2.15. Directly executing scripts from http://www.dhis2.org/download/resources/sql/convert-fixed-attributes-to-dynamic.sql gives errors like column does not exist. *Moemedi NtunyaneCo-founder KeyInConsulting* -- From: moemedi.ntuny...@hotmail.com To: d...@dancocos.com CC: dhis2-devs@lists.launchpad.net Subject: RE: [Dhis2-devs] dhis upgrade from 2.0.5 to 2.15 Date: Tue, 19 Aug 2014 16:47:46 +0200 Hi Dan Thanks a lot. Regards, *Moemedi Ntunyane Co-founder KeyInConsulting* -- Subject: Re: [Dhis2-devs] dhis upgrade from 2.0.5 to 2.15 From: d...@dancocos.com Date: Tue, 19 Aug 2014 10:40:56 -0400 CC: dhis2-devs@lists.launchpad.net To: moemedi.ntuny...@hotmail.com Hello Moemedi, The upgrades should happen automatically except for 2.13-2.14 and 2.14-2.15 Those scripts can be found here https://www.dhis2.org/downloads 2.13-2.14 http://www.dhis2.org/download/resources/sql/convert-fixed-attributes-to-dynamic.sql 2.14-2.15 http://www.dhis2.org/download/resources/sql/rename-patient-to-trackedentity.sql Thanks, Dan *Dan Cocos* BAO Systems www.baosystems.com T: +1 202-352-2671 | skype: dancocos On Aug 19, 2014, at 6:40 AM, Moemedi Ntunyane moemedi.ntuny...@hotmail.com wrote: Hi Developers, where can I get the upgrade scripts from the very lowest dhis 2.0.6 so that i do incremental *Moemedi Ntunyane Co-founder KeyInConsulting* ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp -- Knut Staring Dept. of Informatics, University of Oslo +4791880522 http://dhis2.org ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs] Missing DataValues when we add 'Categories' dimenssion in the layout
Hi, this is now fixed in the affected versions. On Tue, Aug 19, 2014 at 3:47 PM, Juan Manuel Alcantara Acosta jmalcanta...@gmail.com wrote: Ah! I see what you mean. I was able to get a result using the data element (total) and assigned categories in columns but selecting a specific data element with cat combination in details doesn’t render the data, yes this is new. Best regards, JM El 19/08/2014, a las 04:13, Rodolfo Melia rme...@knowming.com escribió: Hi - I just tested again. It does take a while to load (6-10secs) But the issue that I'm reporting is that that the pivot table doesn't populate with data. See images below Screen Shot 2014-08-19 at 10.08.24.png Screen Shot 2014-08-19 at 10.09.19.png *Rodolfo Meliá* *Principal | *rme...@knowming.com Skype: rod.melia | +44 777 576 4090 | +1 708 872 7636 www.knowming.com On Tue, Aug 19, 2014 at 4:31 AM, Juan Manuel Alcantara Acosta jmalcanta...@gmail.com wrote: Hi Rodolfo I tested this in https://apps.dhis2.org/demo/ https://apps.dhis2.org/demo/dhis-web-pivot/app/index.html and it works but it takes around 15 seconds to load the list of data elements when you select details, it certainly gives the impression that it doesn’t work. By the way, the update of www and dev2 is still pending, we should be running build #130 dated August 13, 2014 Best regards, JM El 18/08/2014, a las 19:13, Rodolfo Melia rme...@knowming.com escribió: Hi this problem got sorted for 2.15 (at least I know it works for Build revision: 15196 / 2014-07-25 02:06), but seems to be back on 2.16. I just tested at https://apps.dhis2.org/demo/ https://apps.dhis2.org/demo/dhis-web-pivot/app/index.html and observed the same problem that Jose originally reported - the details don't show. I'm having this problem in the following servers - PSI staging: v2.16: Build revision: 16320 / 2014-08-16 02:04 - EH: v2.16 Build revision: 16320 / 2014-08-16 02:04 *Rodolfo Meliá* *Principal | *rme...@knowming.com Skype: rod.melia | +44 777 576 4090 | +1 708 872 7636 www.knowming.com On Thu, Jul 31, 2014 at 10:54 AM, Jose Garcia Muñoz josem...@gmail.com wrote: Hi guys, any feedback on this? Regards Jose On Sat, Jul 12, 2014 at 12:36 PM, Jose Garcia Muñoz josem...@gmail.com wrote: Dear all, in pivot tables when we add the 'Categories' dimenssion to the layouts, the values are not showed. I have tested it in Sierra Leone Demo. Without categories image.png With categories image.png Am I missing something? or do we have a bug here? Thanks Jose ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs] dhis upgrade from 2.0.5 to 2.15
I thought Dan's point was that it would not be necessary to go through every version? But if it's necessary, maybe it would suffice to describe in simple steps how to build old versions. On Wed, Aug 20, 2014 at 12:15 PM, Bob Jolliffe bobjolli...@gmail.com wrote: The question of upgrading from very old dhis2 versions came up recently in another post. It emerged then that we don't seem to have a historical archive (museum!) of war artefacts going back beyond 2.10 on http://apps.dhis2.org/ci. We do have the source code tagged back as far as 2.4. Has anybody kept hold of these historic build or should we consider rebuilding and making available? Who would volunteer to do that? On 19 August 2014 22:59, Knut Staring knu...@gmail.com wrote: Hi Moemedi, Not sure, but I think you could try upgrading directly from 2.0.5 to 2.13 first, and then run the first script. Then 2.14, then script, then 2.15. If things don't work, you should provide the actual error messages. On Tue, Aug 19, 2014 at 6:17 PM, Moemedi Ntunyane moemedi.ntuny...@hotmail.com wrote: Hi All I am upgrading DHIS 2.0.5 using postgreSQL DB, is there a shortcut other than using incremental way like 2.0.5, 2.0.6 ..to 2.15. Directly executing scripts from http://www.dhis2.org/download/resources/sql/convert-fixed-attributes-to-dynamic.sql gives errors like column does not exist. *Moemedi NtunyaneCo-founder KeyInConsulting* -- From: moemedi.ntuny...@hotmail.com To: d...@dancocos.com CC: dhis2-devs@lists.launchpad.net Subject: RE: [Dhis2-devs] dhis upgrade from 2.0.5 to 2.15 Date: Tue, 19 Aug 2014 16:47:46 +0200 Hi Dan Thanks a lot. Regards, *Moemedi Ntunyane Co-founder KeyInConsulting* -- Subject: Re: [Dhis2-devs] dhis upgrade from 2.0.5 to 2.15 From: d...@dancocos.com Date: Tue, 19 Aug 2014 10:40:56 -0400 CC: dhis2-devs@lists.launchpad.net To: moemedi.ntuny...@hotmail.com Hello Moemedi, The upgrades should happen automatically except for 2.13-2.14 and 2.14-2.15 Those scripts can be found here https://www.dhis2.org/downloads 2.13-2.14 http://www.dhis2.org/download/resources/sql/convert-fixed-attributes-to-dynamic.sql 2.14-2.15 http://www.dhis2.org/download/resources/sql/rename-patient-to-trackedentity.sql Thanks, Dan *Dan Cocos* BAO Systems www.baosystems.com T: +1 202-352-2671 | skype: dancocos On Aug 19, 2014, at 6:40 AM, Moemedi Ntunyane moemedi.ntuny...@hotmail.com wrote: Hi Developers, where can I get the upgrade scripts from the very lowest dhis 2.0.6 so that i do incremental *Moemedi Ntunyane Co-founder KeyInConsulting* ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp -- Knut Staring Dept. of Informatics, University of Oslo +4791880522 http://dhis2.org ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp -- Knut Staring Dept. of Informatics, University of Oslo +4791880522 http://dhis2.org ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16453: minor performance optimization in calendar
revno: 16453
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Wed 2014-08-20 17:58:24 +0700
message:
minor performance optimization in calendar
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/BiMonthlyPeriodType.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/CalendarPeriodType.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/DailyPeriodType.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/FinancialPeriodType.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/MonthlyPeriodType.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/QuarterlyPeriodType.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/SixMonthlyAbstractPeriodType.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/TwoYearlyPeriodType.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/WeeklyPeriodType.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/YearlyPeriodType.java
--
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
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/BiMonthlyPeriodType.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/BiMonthlyPeriodType.java 2014-08-11 05:27:09 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/BiMonthlyPeriodType.java 2014-08-20 10:58:24 +
@@ -86,25 +86,21 @@
// -
@Override
-public Period getNextPeriod( Period period )
+public Period getNextPeriod( Period period, Calendar calendar )
{
-Calendar cal = getCalendar();
-
-DateUnit dateUnit = cal.fromIso( DateUnit.fromJdkDate( period.getStartDate() ) );
-dateUnit = cal.plusMonths( dateUnit, 2 );
-
-return createPeriod( cal.toIso( dateUnit ), cal );
+DateUnit dateUnit = calendar.fromIso( DateUnit.fromJdkDate( period.getStartDate() ) );
+dateUnit = calendar.plusMonths( dateUnit, 2 );
+
+return createPeriod( calendar.toIso( dateUnit ), calendar );
}
@Override
-public Period getPreviousPeriod( Period period )
+public Period getPreviousPeriod( Period period, Calendar calendar )
{
-Calendar cal = getCalendar();
-
-DateUnit dateUnit = cal.fromIso( DateUnit.fromJdkDate( period.getStartDate() ) );
-dateUnit = cal.minusMonths( dateUnit, 2 );
-
-return createPeriod( cal.toIso( dateUnit ), cal );
+DateUnit dateUnit = calendar.fromIso( DateUnit.fromJdkDate( period.getStartDate() ) );
+dateUnit = calendar.minusMonths( dateUnit, 2 );
+
+return createPeriod( calendar.toIso( dateUnit ), calendar );
}
/**
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/CalendarPeriodType.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/CalendarPeriodType.java 2014-08-15 07:40:20 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/CalendarPeriodType.java 2014-08-20 10:58:24 +
@@ -29,6 +29,7 @@
*/
import com.google.common.collect.Lists;
+import org.hisp.dhis.calendar.Calendar;
import org.hisp.dhis.calendar.DateUnit;
import java.util.ArrayList;
@@ -63,18 +64,46 @@
* @param period the Period to base the next Period on.
* @return a Period which is the next of the given Period.
*/
-public abstract Period getNextPeriod( Period period );
-
-/**
- * Returns a Period which is the previous of the given Period. Only valid
- * Periods are returned. If the given Period is of different PeriodType than
- * the executing PeriodType, or the given Period is invalid, the returned
- * Period might overlap the given Period.
- *
- * @param period the Period to base the previous Period on.
- * @return a Period which is the previous of the given Period.
- */
-public abstract Period getPreviousPeriod( Period period );
+public final Period getNextPeriod( Period period )
+{
+return getNextPeriod( period, getCalendar() );
+}
+
+/**
+ * Returns a Period which is the next of the given Period. Only valid
+ * Periods are returned. If the given Period is of different PeriodType than
+ * the executing PeriodType, or the given Period is invalid, the returned
+ * Period might overlap the given Period.
+ *
+ * @param period the Period to base the next Period on.
+ * @return a Period which is the next of the given Period.
+ */
+public abstract Period getNextPeriod( Period period, Calendar calendar );
+
+/**
+ * Returns a Period which is the previous of the given Period. Only valid
+ * Periods are returned. If the given Period is of different PeriodType than
+ * the executing PeriodType,
Re: [Dhis2-devs] dhis upgrade from 2.0.5 to 2.15
Yes in theory they should. Though there was much which changed between 2.05 and 2.10. All of the table altering stuff from earlier versions should be accumulated in newer versions but I recall that sometimes things did not go smoothely with major jumps in versions. I guess the simple fact is that incremental upgrades tend to get tested pretty heavily. Jumping versions becomes more of a leap of faith :-) But I do agree, if someone can verify that 2.05 to 2.10 works fine, then it would be good to hear. I suspect the bigger problems will arise because the metadata integrity control on earlier versions was a good bit looser, so there will be hiccups caused by inconsistencies in categoryoptions, groupsets etc due to broken metadata in old databases. Certainly before attempting such an upgrade I would consider trying to repair as much of these as possible, though again without tools it is not always really easy. Of course the most important thing is to make sure you do all of these experiments in the full knowledge that you have a complete, verified/restored backup copy of the source database. Meanwhile I guess the answer to my earlier question is that nobody has setup a dhis war museum. Regards Bob On 20 August 2014 11:25, Knut Staring knu...@gmail.com wrote: I thought Dan's point was that it would not be necessary to go through every version? But if it's necessary, maybe it would suffice to describe in simple steps how to build old versions. On Wed, Aug 20, 2014 at 12:15 PM, Bob Jolliffe bobjolli...@gmail.com wrote: The question of upgrading from very old dhis2 versions came up recently in another post. It emerged then that we don't seem to have a historical archive (museum!) of war artefacts going back beyond 2.10 on http://apps.dhis2.org/ci. We do have the source code tagged back as far as 2.4. Has anybody kept hold of these historic build or should we consider rebuilding and making available? Who would volunteer to do that? On 19 August 2014 22:59, Knut Staring knu...@gmail.com wrote: Hi Moemedi, Not sure, but I think you could try upgrading directly from 2.0.5 to 2.13 first, and then run the first script. Then 2.14, then script, then 2.15. If things don't work, you should provide the actual error messages. On Tue, Aug 19, 2014 at 6:17 PM, Moemedi Ntunyane moemedi.ntuny...@hotmail.com wrote: Hi All I am upgrading DHIS 2.0.5 using postgreSQL DB, is there a shortcut other than using incremental way like 2.0.5, 2.0.6 ..to 2.15. Directly executing scripts from http://www.dhis2.org/download/resources/sql/convert-fixed-attributes-to-dynamic.sql gives errors like column does not exist. *Moemedi NtunyaneCo-founder KeyInConsulting* -- From: moemedi.ntuny...@hotmail.com To: d...@dancocos.com CC: dhis2-devs@lists.launchpad.net Subject: RE: [Dhis2-devs] dhis upgrade from 2.0.5 to 2.15 Date: Tue, 19 Aug 2014 16:47:46 +0200 Hi Dan Thanks a lot. Regards, *Moemedi Ntunyane Co-founder KeyInConsulting* -- Subject: Re: [Dhis2-devs] dhis upgrade from 2.0.5 to 2.15 From: d...@dancocos.com Date: Tue, 19 Aug 2014 10:40:56 -0400 CC: dhis2-devs@lists.launchpad.net To: moemedi.ntuny...@hotmail.com Hello Moemedi, The upgrades should happen automatically except for 2.13-2.14 and 2.14-2.15 Those scripts can be found here https://www.dhis2.org/downloads 2.13-2.14 http://www.dhis2.org/download/resources/sql/convert-fixed-attributes-to-dynamic.sql 2.14-2.15 http://www.dhis2.org/download/resources/sql/rename-patient-to-trackedentity.sql Thanks, Dan *Dan Cocos* BAO Systems www.baosystems.com T: +1 202-352-2671 | skype: dancocos On Aug 19, 2014, at 6:40 AM, Moemedi Ntunyane moemedi.ntuny...@hotmail.com wrote: Hi Developers, where can I get the upgrade scripts from the very lowest dhis 2.0.6 so that i do incremental *Moemedi Ntunyane Co-founder KeyInConsulting* ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp -- Knut Staring Dept. of Informatics, University of Oslo +4791880522 http://dhis2.org ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp -- Knut Staring Dept. of Informatics, University of Oslo +4791880522 http://dhis2.org ___ Mailing list:
[Dhis2-devs] Custom Tracked Entity Form
Greetings... In my effort to create a custom tracked entity form with bi-lingual (English French) functionality...I quickly decided to use jQuery and HTML DIVs as coded here http://pastebin.com/CP3u1jZ8 *i.e. this is just a snippet of the code*. As a newbie i finally got it working on my HTTP localhost (outside DHIS2) however as i try to replicate it inside the DHIS2 tracked entity form - *alas *- things go wrong; i can't seem to get it working with the show/hide functionality its intended for. Once i select French from the select option, it displays the French DIV but also leaves the English DIV showing too. Any help on this is much appreciated... - * Blessings regards* Martin Namutso (Snr) IT/MIS Consultant *|* Mob: +256 782 006 662* / *+256 704 336 161 *| * http://ug.linkedin.com/in/mnamutso *1. To oppose Corruption in government is the highest obligation of patriotism - G. Edward Griffin2.** Try not to become a man of success but a man of value - Albert Einstein* ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16454: PT dimension loading mask.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
revno: 16454 [merge]
committer: Jan Henrik Overland janhenrik.overl...@gmail.com
branch nick: dhis2
timestamp: Wed 2014-08-20 15:08:23 +0200
message:
PT dimension loading mask.
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/scripts/core.js
--
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
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/scripts/app.js 2014-08-20 09:09:22 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/scripts/app.js 2014-08-20 13:05:12 +
@@ -2642,6 +2642,7 @@
}
store.isPending = true;
+ns.core.web.mask.show(indicatorAvailable.boundList);
Ext.Ajax.request({
url: ns.core.init.contextPath + '/api' + path,
@@ -2649,15 +2650,16 @@
page: store.nextPage,
pageSize: 50
},
-failure: function() {
-store.isPending = false;
-},
success: function(r) {
var response = Ext.decode(r.responseText),
data = response.indicators || [],
pager = response.pager;
store.loadStore(data, pager, append);
+},
+callback: function() {
+store.isPending = false;
+ns.core.web.mask.hide(indicatorAvailable.boundList);
}
});
},
@@ -2770,6 +2772,7 @@
}
store.isPending = true;
+ns.core.web.mask.show(dataElementAvailable.boundList);
Ext.Ajax.request({
url: ns.core.init.contextPath + '/api' + path,
@@ -2777,15 +2780,16 @@
page: store.nextPage,
pageSize: 50
},
-failure: function() {
-store.isPending = false;
-},
success: function(r) {
var response = Ext.decode(r.responseText),
data = response.dataElements || [],
pager = response.pager;
store.loadStore(data, pager, append);
+},
+callback: function() {
+store.isPending = false;
+ns.core.web.mask.hide(dataElementAvailable.boundList);
}
});
},
@@ -2798,7 +2802,6 @@
}
if (Ext.isString(uid)) {
- //path = '/dataElementGroups/' + uid + '/operands' + (filter ? '/query/' + filter : '') + '.json';
path = '/dataElementOperands.json?fields=id,namefilter=dataElement.dataElementGroups.id:eq:' + uid + (filter ? 'filter=name:like:' + filter : '');
}
else if (uid === 0) {
@@ -2811,6 +2814,7 @@
}
store.isPending = true;
+ns.core.web.mask.show(dataElementAvailable.boundList);
Ext.Ajax.request({
url: ns.core.init.contextPath + '/api' + path,
@@ -2818,9 +2822,6 @@
page: store.nextPage,
pageSize: 50
},
-failure: function() {
-store.isPending = false;
-},
success: function(r) {
var response = Ext.decode(r.responseText),
data = response.objects || response.dataElementOperands || [],
@@ -2831,6 +2832,10 @@
}
store.loadStore(data, pager, append);
+},
+callback: function() {
+store.isPending = false;
+ns.core.web.mask.hide(dataElementAvailable.boundList);
}
});
},
@@ -2915,6 +2920,7 @@
}
store.isPending = true;
+ns.core.web.mask.show(dataSetAvailable.boundList);
Ext.Ajax.request({
url: ns.core.init.contextPath + '/api' + path,
@@ -2922,15 +2928,16 @@
page: store.nextPage,
pageSize: 50
},
-failure: function() {
-
Re: [Dhis2-devs] Missing DataValues when we add 'Categories' dimenssion in the layout
I have also added load masks on the available panel for indicators, data elements etc. On Wed, Aug 20, 2014 at 12:17 PM, Jan Henrik Øverland janhenrik.overl...@gmail.com wrote: Hi, this is now fixed in the affected versions. On Tue, Aug 19, 2014 at 3:47 PM, Juan Manuel Alcantara Acosta jmalcanta...@gmail.com wrote: Ah! I see what you mean. I was able to get a result using the data element (total) and assigned categories in columns but selecting a specific data element with cat combination in details doesn’t render the data, yes this is new. Best regards, JM El 19/08/2014, a las 04:13, Rodolfo Melia rme...@knowming.com escribió: Hi - I just tested again. It does take a while to load (6-10secs) But the issue that I'm reporting is that that the pivot table doesn't populate with data. See images below Screen Shot 2014-08-19 at 10.08.24.png Screen Shot 2014-08-19 at 10.09.19.png *Rodolfo Meliá* *Principal | *rme...@knowming.com Skype: rod.melia | +44 777 576 4090 | +1 708 872 7636 www.knowming.com On Tue, Aug 19, 2014 at 4:31 AM, Juan Manuel Alcantara Acosta jmalcanta...@gmail.com wrote: Hi Rodolfo I tested this in https://apps.dhis2.org/demo/ https://apps.dhis2.org/demo/dhis-web-pivot/app/index.html and it works but it takes around 15 seconds to load the list of data elements when you select details, it certainly gives the impression that it doesn’t work. By the way, the update of www and dev2 is still pending, we should be running build #130 dated August 13, 2014 Best regards, JM El 18/08/2014, a las 19:13, Rodolfo Melia rme...@knowming.com escribió: Hi this problem got sorted for 2.15 (at least I know it works for Build revision: 15196 / 2014-07-25 02:06), but seems to be back on 2.16. I just tested at https://apps.dhis2.org/demo/ https://apps.dhis2.org/demo/dhis-web-pivot/app/index.html and observed the same problem that Jose originally reported - the details don't show. I'm having this problem in the following servers - PSI staging: v2.16: Build revision: 16320 / 2014-08-16 02:04 - EH: v2.16 Build revision: 16320 / 2014-08-16 02:04 *Rodolfo Meliá* *Principal | *rme...@knowming.com Skype: rod.melia | +44 777 576 4090 | +1 708 872 7636 www.knowming.com On Thu, Jul 31, 2014 at 10:54 AM, Jose Garcia Muñoz josem...@gmail.com wrote: Hi guys, any feedback on this? Regards Jose On Sat, Jul 12, 2014 at 12:36 PM, Jose Garcia Muñoz josem...@gmail.com wrote: Dear all, in pivot tables when we add the 'Categories' dimenssion to the layouts, the values are not showed. I have tested it in Sierra Leone Demo. Without categories image.png With categories image.png Am I missing something? or do we have a bug here? Thanks Jose ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16455: DV dimension load mask.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
revno: 16455 [merge]
committer: Jan Henrik Overland janhenrik.overl...@gmail.com
branch nick: dhis2
timestamp: Wed 2014-08-20 15:29:00 +0200
message:
DV dimension load mask.
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/scripts/app.js
--
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
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2014-08-13 14:12:10 +
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2014-08-20 13:27:26 +
@@ -2626,6 +2626,7 @@
}
store.isPending = true;
+ns.core.web.mask.show(indicatorAvailable.boundList);
Ext.Ajax.request({
url: ns.core.init.contextPath + '/api' + path,
@@ -2633,15 +2634,16 @@
page: store.nextPage,
pageSize: 50
},
-failure: function() {
-store.isPending = false;
-},
success: function(r) {
var response = Ext.decode(r.responseText),
data = response.indicators || [],
pager = response.pager;
store.loadStore(data, pager, append);
+},
+callback: function() {
+store.isPending = false;
+ns.core.web.mask.hide(indicatorAvailable.boundList);
}
});
},
@@ -2755,6 +2757,7 @@
}
store.isPending = true;
+ns.core.web.mask.show(dataElementAvailable.boundList);
Ext.Ajax.request({
url: ns.core.init.contextPath + '/api' + path,
@@ -2762,15 +2765,16 @@
page: store.nextPage,
pageSize: 50
},
-failure: function() {
-store.isPending = false;
-},
success: function(r) {
var response = Ext.decode(r.responseText),
data = response.dataElements || [],
pager = response.pager;
store.loadStore(data, pager, append);
+},
+callback: function() {
+store.isPending = false;
+ns.core.web.mask.hide(dataElementAvailable.boundList);
}
});
},
@@ -2784,7 +2788,6 @@
}
if (Ext.isString(uid)) {
- //path = '/dataElementGroups/' + uid + '/operands' + (filter ? '/query/' + filter : '') + '.json';
path = '/dataElementOperands.json?fields=id,namefilter=dataElement.dataElementGroups.id:eq:' + uid + (filter ? 'filter=name:like:' + filter : '');
}
else if (uid === 0) {
@@ -2797,6 +2800,7 @@
}
store.isPending = true;
+ns.core.web.mask.show(dataElementAvailable.boundList);
Ext.Ajax.request({
url: ns.core.init.contextPath + '/api' + path,
@@ -2804,9 +2808,6 @@
page: store.nextPage,
pageSize: 50
},
-failure: function() {
-store.isPending = false;
-},
success: function(r) {
var response = Ext.decode(r.responseText),
data = response.objects || response.dataElementOperands || [],
@@ -2817,6 +2818,10 @@
}
store.loadStore(data, pager, append);
+},
+callback: function() {
+store.isPending = false;
+ns.core.web.mask.hide(dataElementAvailable.boundList);
}
});
},
@@ -2901,6 +2906,7 @@
}
store.isPending = true;
+ns.core.web.mask.show(dataSetAvailable.boundList);
Ext.Ajax.request({
url: ns.core.init.contextPath + '/api' + path,
@@ -2908,15 +2914,16 @@
page: store.nextPage,
pageSize: 50
},
-failure: function() {
-store.isPending = false;
-},
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16456: data element decoation flag data removal fixed.
revno: 16456 committer: James Chang jamesbch...@gmail.com branch nick: dhis2 timestamp: Wed 2014-08-20 21:06:29 +0700 message: data element decoation flag data removal fixed. modified: dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/LoadFormAction.java -- 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 === modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/LoadFormAction.java' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/LoadFormAction.java 2014-08-15 07:40:20 + +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/LoadFormAction.java 2014-08-20 14:06:29 + @@ -323,6 +323,7 @@ dataSetCopy.setShortName( dataSet.getShortName() ); dataSetCopy.setRenderAsTabs( dataSet.isRenderAsTabs() ); dataSetCopy.setRenderHorizontally( dataSet.isRenderHorizontally() ); +dataSetCopy.setDataElementDecoration( dataSet.isDataElementDecoration() ); dataSet = dataSetCopy; for ( int i = 0; i orderedCategoryCombos.size(); i++ ) ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16457: Removed unused code
revno: 16457
committer: Lars Helge Overland larshe...@gmail.com
branch nick: dhis2
timestamp: Wed 2014-08-20 16:33:02 +0200
message:
Removed unused code
modified:
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java
--
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
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java 2014-08-15 07:40:20 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java 2014-08-20 14:33:02 +
@@ -28,7 +28,27 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import com.csvreader.CsvReader;
+import static com.google.common.collect.Sets.newHashSet;
+import static org.apache.commons.lang.StringUtils.trimToNull;
+import static org.hisp.dhis.common.IdentifiableObject.IdentifiableProperty.UUID;
+import static org.hisp.dhis.system.notification.NotificationLevel.ERROR;
+import static org.hisp.dhis.system.notification.NotificationLevel.INFO;
+import static org.hisp.dhis.system.util.ConversionUtils.wrap;
+import static org.hisp.dhis.system.util.DateUtils.getDefaultDate;
+import static org.hisp.dhis.system.util.DateUtils.parseDate;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Writer;
+import java.nio.charset.Charset;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
import org.amplecode.quick.BatchHandler;
import org.amplecode.quick.BatchHandlerFactory;
import org.amplecode.staxwax.factory.XMLFactory;
@@ -72,26 +92,7 @@
import org.hisp.dhis.user.CurrentUserService;
import org.springframework.beans.factory.annotation.Autowired;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Writer;
-import java.nio.charset.Charset;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import static com.google.common.collect.Sets.newHashSet;
-import static org.apache.commons.lang.StringUtils.trimToNull;
-import static org.hisp.dhis.common.IdentifiableObject.IdentifiableProperty.UUID;
-import static org.hisp.dhis.system.notification.NotificationLevel.ERROR;
-import static org.hisp.dhis.system.notification.NotificationLevel.INFO;
-import static org.hisp.dhis.system.util.ConversionUtils.wrap;
-import static org.hisp.dhis.system.util.DateUtils.getDefaultDate;
-import static org.hisp.dhis.system.util.DateUtils.parseDate;
+import com.csvreader.CsvReader;
/**
* @author Lars Helge Overland
@@ -107,8 +108,6 @@
private static final String ERROR_INVALID_ORG_UNIT = Invalid org unit: ;
-private static final String ERROR_INVALID_START_END_DATE = Invalid start and/or end date: ;
-
private static final String ERROR_OBJECT_NEEDED_TO_COMPLETE = Must be provided to complete data set;
@Autowired
@@ -722,42 +721,6 @@
summary.setDataSetComplete( DateUtils.getMediumDateString( completeDate ) );
}
-private SetDataElement getDataElements( SetString dataSets )
-{
-SetDataElement dataElements = new HashSet();
-
-for ( String ds : dataSets )
-{
-DataSet dataSet = dataSetService.getDataSet( ds );
-
-if ( dataSet == null )
-{
-throw new IllegalArgumentException( ERROR_INVALID_DATA_SET + ds );
-}
-
-dataElements.addAll( dataSet.getDataElements() );
-}
-
-return dataElements;
-}
-
-private SetPeriod getPeriods( Date startDate, Date endDate )
-{
-if ( startDate == null || endDate == null || endDate.before( startDate ) )
-{
-throw new IllegalArgumentException( ERROR_INVALID_START_END_DATE + startDate + , + endDate );
-}
-
-SetPeriod periods = new HashSet( periodService.getPeriodsBetweenDates( startDate, endDate ) );
-
-if ( periods.isEmpty() )
-{
-throw new IllegalArgumentException( No periods exist for start/end date: + startDate + , + endDate );
-}
-
-return periods;
-}
-
private SetOrganisationUnit getOrgUnits( SetString orgUnits )
{
SetOrganisationUnit organisationUnits = new HashSet();
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to :
Re: [Dhis2-devs] dhis upgrade from 2.0.5 to 2.15
Hi, I posted a similar requirement a few months back. From my experience 2.0 to 2.10 worked fine. Regards, Busoye On 20 Aug 2014, at 12:12, Bob Jolliffe bobjolli...@gmail.com wrote: Yes in theory they should. Though there was much which changed between 2.05 and 2.10. All of the table altering stuff from earlier versions should be accumulated in newer versions but I recall that sometimes things did not go smoothely with major jumps in versions. I guess the simple fact is that incremental upgrades tend to get tested pretty heavily. Jumping versions becomes more of a leap of faith :-) But I do agree, if someone can verify that 2.05 to 2.10 works fine, then it would be good to hear. I suspect the bigger problems will arise because the metadata integrity control on earlier versions was a good bit looser, so there will be hiccups caused by inconsistencies in categoryoptions, groupsets etc due to broken metadata in old databases. Certainly before attempting such an upgrade I would consider trying to repair as much of these as possible, though again without tools it is not always really easy. Of course the most important thing is to make sure you do all of these experiments in the full knowledge that you have a complete, verified/restored backup copy of the source database. Meanwhile I guess the answer to my earlier question is that nobody has setup a dhis war museum. Regards Bob On 20 August 2014 11:25, Knut Staring knu...@gmail.com wrote: I thought Dan's point was that it would not be necessary to go through every version? But if it's necessary, maybe it would suffice to describe in simple steps how to build old versions. On Wed, Aug 20, 2014 at 12:15 PM, Bob Jolliffe bobjolli...@gmail.com wrote: The question of upgrading from very old dhis2 versions came up recently in another post. It emerged then that we don't seem to have a historical archive (museum!) of war artefacts going back beyond 2.10 on http://apps.dhis2.org/ci. We do have the source code tagged back as far as 2.4. Has anybody kept hold of these historic build or should we consider rebuilding and making available? Who would volunteer to do that? On 19 August 2014 22:59, Knut Staring knu...@gmail.com wrote: Hi Moemedi, Not sure, but I think you could try upgrading directly from 2.0.5 to 2.13 first, and then run the first script. Then 2.14, then script, then 2.15. If things don't work, you should provide the actual error messages. On Tue, Aug 19, 2014 at 6:17 PM, Moemedi Ntunyane moemedi.ntuny...@hotmail.com wrote: Hi All I am upgrading DHIS 2.0.5 using postgreSQL DB, is there a shortcut other than using incremental way like 2.0.5, 2.0.6 ..to 2.15. Directly executing scripts from http://www.dhis2.org/download/resources/sql/convert-fixed-attributes-to-dynamic.sql gives errors like column does not exist. Moemedi Ntunyane Co-founder KeyInConsulting From: moemedi.ntuny...@hotmail.com To: d...@dancocos.com CC: dhis2-devs@lists.launchpad.net Subject: RE: [Dhis2-devs] dhis upgrade from 2.0.5 to 2.15 Date: Tue, 19 Aug 2014 16:47:46 +0200 Hi Dan Thanks a lot. Regards, Moemedi Ntunyane Co-founder KeyInConsulting Subject: Re: [Dhis2-devs] dhis upgrade from 2.0.5 to 2.15 From: d...@dancocos.com Date: Tue, 19 Aug 2014 10:40:56 -0400 CC: dhis2-devs@lists.launchpad.net To: moemedi.ntuny...@hotmail.com Hello Moemedi, The upgrades should happen automatically except for 2.13-2.14 and 2.14-2.15 Those scripts can be found here https://www.dhis2.org/downloads 2.13-2.14 http://www.dhis2.org/download/resources/sql/convert-fixed-attributes-to-dynamic.sql 2.14-2.15 http://www.dhis2.org/download/resources/sql/rename-patient-to-trackedentity.sql Thanks, Dan Dan Cocos BAO Systems www.baosystems.com T: +1 202-352-2671 | skype: dancocos On Aug 19, 2014, at 6:40 AM, Moemedi Ntunyane moemedi.ntuny...@hotmail.com wrote: Hi Developers, where can I get the upgrade scripts from the very lowest dhis 2.0.6 so that i do incremental Moemedi Ntunyane Co-founder KeyInConsulting ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp -- Knut Staring Dept. of Informatics, University of Oslo +4791880522 http://dhis2.org ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help :
Re: [Dhis2-devs] dhis upgrade from 2.0.5 to 2.15
Hi Adebusoye Did you upload run any scripts? just uploaded the war file and restored the old database backup but the problem is everything seems fine but cannot display information related to dataset. Regards, Moemedi Ntunyane Co-founder KeyInConsulting Subject: Re: [Dhis2-devs] dhis upgrade from 2.0.5 to 2.15 From: bus...@hisp.org Date: Wed, 20 Aug 2014 15:47:02 +0100 CC: knu...@gmail.com; dhis2-devs@lists.launchpad.net; moemedi.ntuny...@hotmail.com To: bobjolli...@gmail.com Hi, I posted a similar requirement a few months back. From my experience 2.0 to 2.10 worked fine. Regards, Busoye On 20 Aug 2014, at 12:12, Bob Jolliffe bobjolli...@gmail.com wrote:Yes in theory they should. Though there was much which changed between 2.05 and 2.10. All of the table altering stuff from earlier versions should be accumulated in newer versions but I recall that sometimes things did not go smoothely with major jumps in versions. I guess the simple fact is that incremental upgrades tend to get tested pretty heavily. Jumping versions becomes more of a leap of faith :-) But I do agree, if someone can verify that 2.05 to 2.10 works fine, then it would be good to hear. I suspect the bigger problems will arise because the metadata integrity control on earlier versions was a good bit looser, so there will be hiccups caused by inconsistencies in categoryoptions, groupsets etc due to broken metadata in old databases. Certainly before attempting such an upgrade I would consider trying to repair as much of these as possible, though again without tools it is not always really easy. Of course the most important thing is to make sure you do all of these experiments in the full knowledge that you have a complete, verified/restored backup copy of the source database. Meanwhile I guess the answer to my earlier question is that nobody has setup a dhis war museum. RegardsBob On 20 August 2014 11:25, Knut Staring knu...@gmail.com wrote: I thought Dan's point was that it would not be necessary to go through every version? But if it's necessary, maybe it would suffice to describe in simple steps how to build old versions. On Wed, Aug 20, 2014 at 12:15 PM, Bob Jolliffe bobjolli...@gmail.com wrote: The question of upgrading from very old dhis2 versions came up recently in another post. It emerged then that we don't seem to have a historical archive (museum!) of war artefacts going back beyond 2.10 on http://apps.dhis2.org/ci. We do have the source code tagged back as far as 2.4. Has anybody kept hold of these historic build or should we consider rebuilding and making available? Who would volunteer to do that? On 19 August 2014 22:59, Knut Staring knu...@gmail.com wrote: Hi Moemedi,Not sure, but I think you could try upgrading directly from 2.0.5 to 2.13 first, and then run the first script. Then 2.14, then script, then 2.15. If things don't work, you should provide the actual error messages. On Tue, Aug 19, 2014 at 6:17 PM, Moemedi Ntunyane moemedi.ntuny...@hotmail.com wrote: Hi All I am upgrading DHIS 2.0.5 using postgreSQL DB, is there a shortcut other than using incremental way like 2.0.5, 2.0.6 ..to 2.15. Directly executing scripts from http://www.dhis2.org/download/resources/sql/convert-fixed-attributes-to-dynamic.sql gives errors like column does not exist. Moemedi Ntunyane Co-founder KeyInConsulting From: moemedi.ntuny...@hotmail.com To: d...@dancocos.com CC: dhis2-devs@lists.launchpad.net Subject: RE: [Dhis2-devs] dhis upgrade from 2.0.5 to 2.15 Date: Tue, 19 Aug 2014 16:47:46 +0200 Hi Dan Thanks a lot. Regards, Moemedi Ntunyane Co-founder KeyInConsulting Subject: Re: [Dhis2-devs] dhis upgrade from 2.0.5 to 2.15 From: d...@dancocos.com Date: Tue, 19 Aug 2014 10:40:56 -0400 CC: dhis2-devs@lists.launchpad.net To: moemedi.ntuny...@hotmail.com Hello Moemedi, The upgrades should happen automatically except for 2.13-2.14 and 2.14-2.15 Those scripts can be found here https://www.dhis2.org/downloads 2.13-2.14 http://www.dhis2.org/download/resources/sql/convert-fixed-attributes-to-dynamic.sql 2.14-2.15 http://www.dhis2.org/download/resources/sql/rename-patient-to-trackedentity.sql Thanks,Dan Dan Cocos BAO Systems www.baosystems.com T: +1 202-352-2671 | skype: dancocos On Aug 19, 2014, at 6:40 AM, Moemedi Ntunyane moemedi.ntuny...@hotmail.com wrote: Hi Developers, where can I get the upgrade scripts from the very lowest dhis 2.0.6 so that i do incremental Moemedi Ntunyane Co-founder KeyInConsulting ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] 2.16 Event Capture app
Hi - we have been working with the latest 2.16 (Aug 20), and we noticed a couple of omissions (or bugs?) on the event capture app: - Listing page: date is not displayed as a column – we think it will be nice to have it there as a column - otherwise you need to edit the event to figure out the actual date. - Radio buttons at Data Entry Time: the option to render controls as radio buttons doesn’t seem to work - they always display as drop downs - Form names don’t render on the form - instead it uses the full name - Form section don't render if possible, let us know if they are likely to be fixed now, or if they will be part of future (2.17) version. Rodolfo EH ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16459: do not include enrollment/enrollmentStatus in /api/events if program is anonymous
revno: 16459
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Thu 2014-08-21 12:41:29 +0700
message:
do not include enrollment/enrollmentStatus in /api/events if program is
anonymous
modified:
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JdbcEventStore.java
--
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
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JdbcEventStore.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JdbcEventStore.java 2014-08-15 12:54:04 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JdbcEventStore.java 2014-08-21 05:41:29 +
@@ -28,17 +28,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import static org.hisp.dhis.common.IdentifiableObjectUtils.getIdList;
-import static org.hisp.dhis.system.util.DateUtils.getMediumDateString;
-import static org.hisp.dhis.system.util.TextUtils.getCommaDelimitedString;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -54,8 +45,16 @@
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.support.rowset.SqlRowSet;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.hisp.dhis.common.IdentifiableObjectUtils.getIdList;
+import static org.hisp.dhis.system.util.DateUtils.getMediumDateString;
+import static org.hisp.dhis.system.util.TextUtils.getCommaDelimitedString;
/**
* @author Morten Olav Hansen morte...@gmail.com
@@ -102,7 +101,7 @@
Event event = new Event();
event.setEvent( not_valid );
-
+
SetString notes = new HashSet();
while ( rowSet.next() )
@@ -121,13 +120,18 @@
event.setStatus( EventStatus.valueOf( rowSet.getString( psi_status ) ) );
event.setProgram( rowSet.getString( p_uid ) );
event.setProgramStage( rowSet.getString( ps_uid ) );
-event.setEnrollment( rowSet.getString( pi_uid ) );
-event.setEnrollmentStatus( EventStatus.fromInt( rowSet.getInt( pi_status ) ) );
+
+if ( rowSet.getInt( p_type ) != 3 )
+{
+event.setEnrollment( rowSet.getString( pi_uid ) );
+event.setEnrollmentStatus( EventStatus.fromInt( rowSet.getInt( pi_status ) ) );
+}
+
event.setStoredBy( rowSet.getString( psi_completeduser ) );
event.setOrgUnit( rowSet.getString( ou_uid ) );
-event.setDueDate( StringUtils.defaultIfEmpty(
+event.setDueDate( StringUtils.defaultIfEmpty(
rowSet.getString( psi_duedate ), rowSet.getString( psi_duedate ) ) );
-event.setEventDate( StringUtils.defaultIfEmpty(
+event.setEventDate( StringUtils.defaultIfEmpty(
rowSet.getString( psi_executiondate ), rowSet.getString( psi_executiondate ) ) );
if ( rowSet.getBoolean( ps_capturecoordinates ) )
@@ -161,8 +165,8 @@
}
events.add( event );
-}
-
+}
+
if ( rowSet.getString( pdv_value ) != null rowSet.getString( de_uid ) != null )
{
DataValue dataValue = new DataValue();
@@ -172,20 +176,20 @@
dataValue.setStoredBy( rowSet.getString( pdv_storedby ) );
event.getDataValues().add( dataValue );
-}
-
+}
+
if ( rowSet.getString( psinote_value ) != null !notes.contains( rowSet.getString( psinote_id ) ) )
-{
+{
Note note = new Note();
note.setValue( rowSet.getString( psinote_value ) );
-note.setStoredDate( StringUtils.defaultIfEmpty(
-rowSet.getString( psinote_soreddate ), rowSet.getString( psinote_soreddate ) ) );
+note.setStoredDate( StringUtils.defaultIfEmpty(
+
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16460: minor fix
revno: 16460
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Thu 2014-08-21 12:47:47 +0700
message:
minor fix
modified:
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JdbcEventStore.java
--
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
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JdbcEventStore.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JdbcEventStore.java 2014-08-21 05:41:29 +
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JdbcEventStore.java 2014-08-21 05:47:47 +
@@ -121,7 +121,7 @@
event.setProgram( rowSet.getString( p_uid ) );
event.setProgramStage( rowSet.getString( ps_uid ) );
-if ( rowSet.getInt( p_type ) != 3 )
+if ( rowSet.getInt( p_type ) != Program.SINGLE_EVENT_WITHOUT_REGISTRATION )
{
event.setEnrollment( rowSet.getString( pi_uid ) );
event.setEnrollmentStatus( EventStatus.fromInt( rowSet.getInt( pi_status ) ) );
___
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
