Re: [Dhis2-devs] DHIS 2 Lite Beta
2009/4/16 Saptarshi Purkayastha sun...@gmail.com We were just discussing this yesterday that it would be good to give these to the states... but then since Indian modules are directly using MySQL, it will be sometime until we can use this. OK I see. Is the Indian modules very much depending on MySQL specific functions, or could we rewrite this code to use standard SQL only? If so, the org.hisp.dhis.jdbc.StatementBuilder interface (which gives you SQL statements) could be extended and used here. We have a StatementBuilderFactory in the service-jdbc project which will give you an implementation based on which database you are running. I am happy to help out here if you like. ___ 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 183: Work in progress on Javadoc
revno: 183 committer: Lars Helge Oeverland larshe...@gmail.com branch nick: trunk timestamp: Thu 2009-04-16 16:18:39 +0200 message: Work in progress on Javadoc modified: dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/ChartStore.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/datadictionary/DataDictionaryService.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/datadictionary/DataDictionaryStore.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryComboService.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryComboStore.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionComboService.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionComboStore.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionService.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionStore.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryService.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryStore.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementDimensionColumnOrder.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementDimensionColumnOrderService.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementDimensionColumnOrderStore.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementDimensionRowOrder.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementDimensionRowOrderService.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementDimensionRowOrderStore.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementService.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementStore.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/datamart/DataMartExportService.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/datamart/DataMartExportStore.java The size of the diff (1070 lines) is larger than your specified limit of 1000 lines -- Trunk 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@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] Selenium testing
I've created a very simple selenium test with coverage of the very first level of DHIS2 functionality. Picked up a few usability glitches in the process which I will sort out. I'm running it through firefox rather than compiling a coded suite. I like watching the screens go by in firefox - like a movie :-) Its pretty basic, but I've attached it here in case you find it useful. I know its not good manners to put attachments on mailing list messages, but this is really very small. If anyone can suggest somewhere better to put it (the wiki? in bzr repository?) I'll put it there. Its pretty boring - took about an hour or so to put this one together. I'll try and work through the web modules one at a time (an hour a day max!). Eventually we might have a useful suite. Regards Bob intro.test.xhtml Description: application/xhtml ___ 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 lite
Are you sure? I've just been trying it on my machine and both birt and dhis seem to be running in the same JVM (process). Unless BIRT for some reason forks a new process but that would be very un-java like. I might be wrong as I still haven't got around to the whole report thing (I'd estimate I'm about 35% ploughing through DHIS2). Is BIRT - as included on DHIS - just a webapp, or does it fire up the whole birt-eclipse thing? In which case, yes, that would be a new process, so yes, we would need to run in H2 mixed mode. So yes, you are probably right :-) Nope, its just an exploded WAR. DHIS writes a report template to the root of it. Then the report is requested through an URL which tells BIRT to produce it. BIRT will start a connection to the database and populate the report with data. When I tried requesting such a report in embedded mode, it gave me an error message saying something like database is currently being used by another thread (sorry don't remember exactly). I assumed it was caused by the single-process limitation. Try it out urself, I've added a demo report in the beta lite. If we could come around this (running only embedded) it would be nice...:) As a configuration note, I see that we need to make a $(dhis2.home)/reports directory. I actually moved the dhis2.home location to install_dir/conf. The reports directory (as the documents, importexport) will create itself below this. I might have mis-interpreted you here tho... ___ 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 lite
2009/4/16 Lars Helge Øverland larshe...@gmail.com: Are you sure? I've just been trying it on my machine and both birt and dhis seem to be running in the same JVM (process). Unless BIRT for some reason forks a new process but that would be very un-java like. I might be wrong as I still haven't got around to the whole report thing (I'd estimate I'm about 35% ploughing through DHIS2). Is BIRT - as included on DHIS - just a webapp, or does it fire up the whole birt-eclipse thing? In which case, yes, that would be a new process, so yes, we would need to run in H2 mixed mode. So yes, you are probably right :-) Nope, its just an exploded WAR. DHIS writes a report template to the root of it. Then the report is requested through an URL which tells BIRT to produce it. BIRT will start a connection to the database and populate the report with data. When I tried requesting such a report in embedded mode, it gave me an error message saying something like database is currently being used by another thread (sorry don't remember exactly). I assumed it was caused by the single-process limitation. Try it out urself, I've added a demo report in the beta lite. If we could come around this (running only embedded) it would be nice...:) OK I'll take a look later. Where is the beta-lite? As a configuration note, I see that we need to make a $(dhis2.home)/reports directory. I actually moved the dhis2.home location to install_dir/conf. The reports directory (as the documents, importexport) will create itself below this. I might have mis-interpreted you here tho... OK. I'll try this too :-) Later. Cheers Bob ___ 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 lite
Hi Knut 2009/4/16 Knut Staring knu...@gmail.com: 2009/4/16 Lars Helge Øverland larshe...@gmail.com That's pretty big! I wonder if we should consider distributing it separately as well ie. without the dhis and birt wars. One of the features we can add to the control panel is a user loading/unloading/updating of the wars. Some sort of automated update mechanism would be nice, yes... I wasn't really thinking of automatic at this stage ... just a simple user interface. Hopefully have something finished tomorrow before I get distracted again. I agree it would be nice, but mainly because there should be no need to download new birt.war files very often, whereas you would like to be able to update dhis.war without having to download a package whcih also contains birt.war if you already have that. In comparison to the wars, the lite server is so small as not to matter significantly. It makes eminent sense to have at least dhis.war separate, but it would be even more ideal if people would only have to download the diff with their current war, using rsynch or similar (as mentioned before). I actually developed this kind of functionality (swapping wars, changing database) in BitRock last summer, but BR is very far from an ideal development environment... Been thinking a bit about this. Given that the modus-operandi of dhis-lite is to run with exploded wars, then theoretically it should be much more feasible to update a jar here and there or even just mirror the whole exploded directory structure (using wget). Of course there are a few risks of breaking things, so I would be very reluctant to set anything too automatic without enforcing the server is stopped, database is backed up etc. Still, some things can be done. Regards Bob Things now seem to work fine. Any objections against releasing a beta version so people can try it out? No I think that would be a good idea. It seems pretty usable at present with H2. DHIS 2 lite is very eagerly awaited. OK. ___ 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 -- Cheers, Knut Staring ___ 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 186: Added Javadoc
revno: 186
committer: Lars Helge Oeverland larshe...@gmail.com
branch nick: trunk
timestamp: Thu 2009-04-16 20:58:36 +0200
message:
Added Javadoc
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/pivottable/PivotTableService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportStore.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableStore.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/resourcetable/ResourceTableStore.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/source/SourceStore.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserStore.java
=== modified file
'dhis-2/dhis-api/src/main/java/org/hisp/dhis/pivottable/PivotTableService.java'
---
dhis-2/dhis-api/src/main/java/org/hisp/dhis/pivottable/PivotTableService.java
2009-03-03 16:46:36 +
+++
dhis-2/dhis-api/src/main/java/org/hisp/dhis/pivottable/PivotTableService.java
2009-04-16 18:58:36 +
@@ -34,5 +34,15 @@
*/
public interface PivotTableService
{
+/**
+ * Returns a PivotTable object.
+ *
+ * @param indicatorGroupId the identifier of the IndicatorGroup.
+ * @param periodTypeName the identifier of the PeriodType.
+ * @param startDate the start date string.
+ * @param endDate the end date string.
+ * @param level the OrganisationUnit level.
+ * @return a PivotTable object.
+ */
PivotTable getPivotTable( int indicatorGroupId, String periodTypeName,
String startDate, String endDate, int level );
}
=== modified file
'dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportStore.java
2009-03-03 16:46:36 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportStore.java
2009-04-16 18:58:36 +
@@ -38,11 +38,33 @@
{
String ID = ReportStore.class.getName();
+/**
+ * Saves a Report.
+ *
+ * @param report the Report to save.
+ * @return the generated identifier.
+ */
int saveReport( Report report );
+/**
+ * Retrieves the Report with the given identifier.
+ *
+ * @param id the identifier of the Report to retrieve.
+ * @return the Report.
+ */
Report getReport( int id );
+/**
+ * Deletes a Report.
+ *
+ * @param report the Report to delete.
+ */
void deleteReport( Report report );
+/**
+ * Retrieves all Reports.
+ *
+ * @return a Collection of Reports.
+ */
CollectionReport getAllReports();
}
=== modified file
'dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableService.java'
---
dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableService.java
2009-03-24 10:31:31 +
+++
dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableService.java
2009-04-16 18:58:36 +
@@ -41,23 +41,85 @@
{
String ID = ReportTableService.class.getName();
+/**
+ * Retrieves a List of Periods of the RelativePeriodType.
+ *
+ * @param relatives the RelativePeriods.
+ * @param months the number of months back in time which will be used as
+ *basis for the generation of relative Periods.
+ *
+ * @return a Collection of Periods of the RelativePeriodType.
+ */
ListPeriod getRelativePeriods( RelativePeriods relatives, int months );
+/**
+ * Returns the current date subtracted with the given number of months.
+ *
+ * @param months the numner of months.
+ * @return a Date.
+ */
Date getDateFromPreviousMonth( int months );
+/**
+ * Saves a ReportTable.
+ *
+ * @param reportTable the ReportTable to save.
+ * @return the generated identifier.
+ */
int saveReportTable( ReportTable reportTable );
+/**
+ * Updates a ReportTable.
+ *
+ * @param reportTable the ReportTable to update.
+ */
void updateReportTable( ReportTable reportTable );
+/**
+ * Deletes a ReportTable.
+ *
+ * @param reportTable the ReportTable to delete.
+ */
void deleteReportTable( ReportTable reportTable );
+/**
+ * Retrieves the ReportTable with the given identifier.
+ *
+ * @param id the identifier of the ReportTable to retrieve.
+ * @return the ReportTable.
+ */
ReportTable getReportTable( int id );
+/**
+ * Retrieves a Collection of all ReportTables.
+ *
+ * @return a Collection of ReportTables.
+ */
CollectionReportTable getAllReportTables();
+/**
+ * Retrieves ReportTables with the given identifiers.
+ *
+ * @param reportTables the identfiers of the ReportTables to retrieve.
+ * @return a Collection of ReportTables.
+ */
CollectionReportTable getReportTables(
Re: [Dhis2-devs] dhis lite
2009/4/16 Bob Jolliffe bobjolli...@gmail.com Hi Knut 2009/4/16 Knut Staring knu...@gmail.com: 2009/4/16 Lars Helge Øverland larshe...@gmail.com That's pretty big! I wonder if we should consider distributing it separately as well ie. without the dhis and birt wars. One of the features we can add to the control panel is a user loading/unloading/updating of the wars. Some sort of automated update mechanism would be nice, yes... I wasn't really thinking of automatic at this stage ... just a simple user interface. Hopefully have something finished tomorrow before I get distracted again. Sure - that's what I did with BitRock also - and I think it's quite sufficient that the user does not have to go directly in and replace files (though that is of course not to hard, having a GUI for it gives more assurance thing won't go wrong). I agree it would be nice, but mainly because there should be no need to download new birt.war files very often, whereas you would like to be able to update dhis.war without having to download a package whcih also contains birt.war if you already have that. In comparison to the wars, the lite server is so small as not to matter significantly. It makes eminent sense to have at least dhis.war separate, but it would be even more ideal if people would only have to download the diff with their current war, using rsynch or similar (as mentioned before). I actually developed this kind of functionality (swapping wars, changing database) in BitRock last summer, but BR is very far from an ideal development environment... Been thinking a bit about this. Given that the modus-operandi of dhis-lite is to run with exploded wars, then theoretically it should be much more feasible to update a jar here and there or even just mirror the whole exploded directory structure (using wget). Yes, there are definetely a couple of possibilitiesbut you would have to know which files to get, which I guess can be just based on the date? And include a Java version of wget inside dhis2lite? BTW, should we let dhis2-lite run on port 80? Then people would just have to go to http://localhost. The problem would be intereference with any Apache servers on the machine (not very common), and unfortunately also with Skype in my experience (much more likely). Letting the user specify port (but give default 80, and suggest changing to port 82 in case of problems?). k ___ 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] Selenium testing
On Thu, Apr 16, 2009 at 5:26 PM, Bob Jolliffe bobjolli...@gmail.com wrote: I've created a very simple selenium test with coverage of the very first level of DHIS2 functionality. Picked up a few usability glitches in the process which I will sort out. I'm running it through firefox rather than compiling a coded suite. I like watching the screens go by in firefox - like a movie :-) Its pretty basic, but I've attached it here in case you find it useful. I know its not good manners to put attachments on mailing list messages, but this is really very small. If anyone can suggest somewhere better to put it (the wiki? in bzr repository?) I'll put it there. Its pretty boring - took about an hour or so to put this one together. I'll try and work through the web modules one at a time (an hour a day max!). Eventually we might have a useful suite. Regards Bob Thanks for doing the tedious work:) This is quite cool. Some more info: Selenium tests runs with maven, but the easy way is to install the firefox plug-in, then go to tools - selenium - open the file - enter eg http://localhost:8080/; as baseurl and click play. ___ 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] Selenium testing
Some more info: Selenium tests runs with maven, but the easy way is to install the firefox plug-in, then go to tools - selenium - open the file - enter eg http://localhost:8080/; as baseurl and click play. https://addons.mozilla.org/en-US/firefox/addon/2079 ___ 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 187: Bug #362646: Inconsistent look and feel
revno: 187
committer: Bob Jolliffe bobjolli...@gmail.com
branch nick: dhis2
timestamp: Fri 2009-04-17 01:20:52 +0100
message:
Bug #362646: Inconsistent look and feel
Added heading to Data Entry module main page
Added data_entry string to i18n properties
Changed style of 'current_selection' box
modified:
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties
=== modified file
'dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties'
---
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties
2009-03-10 10:19:13 +
+++
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties
2009-04-17 00:20:52 +
@@ -96,3 +96,4 @@
greater_than_or_equal_to = =
less_than =
less_than_or_equal_to = =
+data_entry = Data Entry
=== modified file
'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm'
---
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm
2009-03-09 07:09:39 +
+++
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm
2009-04-17 00:20:52 +
@@ -1,3 +1,4 @@
+h3$i18n.getString( data_entry )/h3
div id=currentSelection
#if ( $organisationUnit ) $encoder.htmlEncode( $organisationUnit.name
)#else $i18n.getString( no_organisationunit_selected ) #end -
=== modified file
'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css'
---
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css
2009-03-03 16:46:36 +
+++
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css
2009-04-17 00:20:52 +
@@ -1,15 +1,11 @@
#currentSelection
{
- position: fixed;
- top: 95px;
- right: 5px;
color: black;
padding: 5px;
background-color: #D5FFC5;
border: 1px solid black;
font-size: 14px;
- width: 58%;
text-align: right;
}
=== modified file
'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties'
---
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties
2009-03-14 06:16:14 +
+++
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties
2009-04-17 00:20:52 +
@@ -1,4 +1,4 @@
-data_locking
= Data Locking
+data_locking
= Data Locking
locked_datasets
= Locked data sets
unlocked_datasets
= Unlocked data sets
save
= Save
--
Trunk
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@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] [Bug 362646] Re: inconsistent look and feel in data entry module
** Changed in: dhis2 Status: New = Fix Committed -- inconsistent look and feel in data entry module https://bugs.launchpad.net/bugs/362646 You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. Status in District Health Information Software 2: Fix Committed Bug description: Each of the web modules, on opening, contain h3some title text/h3 at the top of the main panel. This one does not and is jarring on the eye. ___ 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
