Re: [Dhis2-devs] [Dhis2-users] DHIS CSV import error
I tried exporting CSV from demo app as you explained in email above. The column for datetime of row is different in both CSVs. i.e. Column is 'timestamp' in CSV exported from my instance of DHIS, but the column name is 'lastupdated' in CSV exported from Demo app. Seems that there s some version difference. From where I can get the same app as one deployed on demo server. On Thu, Dec 19, 2013 at 12:34 PM, Maimoona Kausar maimoona.kau...@irdinformatics.org wrote: I tried importing CSV again with category undeleted, and changed the period, and values. it says 8 updated but new value is not reflected in tables. On Thu, Dec 19, 2013 at 12:26 PM, Maimoona Kausar maimoona.kau...@irdinformatics.org wrote: I deleted it because it was mentioned as non-required option. And the system from which we would get our CSV may not have category. On Thu, Dec 19, 2013 at 12:19 PM, Lars Helge Øverland larshe...@gmail.com wrote: Okay. Any idea why categoryoptioncombos are not there? On Thu, Dec 19, 2013 at 8:17 AM, Maimoona Kausar maimoona.kau...@irdinformatics.org wrote: The email above contains image for CSV data being imported. On Thu, Dec 19, 2013 at 12:14 PM, Lars Helge Øverland larshe...@gmail.com wrote: Hello Maimoona, thanks for reporting. I have tried to reproduce your problem but could not. What I did on the demo was: - Export data in CSV format for Ngelehun 2013-02-01 - 2013-04-01 for PHUF 2 form - Removed the corresponding data by simply blanking out in the data entry form - Imported the CSV file This lead to data re-appearing in the form. Some things to check: - What does your CSV file look like, does it have values, can you please post it? - If you already have data in your database and do an export, then you must remove some of it for the import to have any effect on the same database. - The CSV file is using UIDs, not database ids, category option combo id to 15 will not work. Let us know. Lars On Thu, Dec 19, 2013 at 6:42 AM, Maimoona Kausar maimoona.kau...@irdinformatics.org wrote: Hi Team, I am working with CSV import module of DHIS 2.13 live. It doesnot import any data into datavalue table. Neither does it show any row in importdatavalue/importobject tables. The CSV I am trying to import was exported using DHIS CSV export module to make sure that format is correct. Attached are images of import activity. I also tried putting ID 15 (default catergorycombination) into CSV, but it didnot help too. Please let me know if I am making some mistake in understanding the import functionality and the way it works. Many thanks, Maimoona ___ Mailing list: https://launchpad.net/~dhis2-users Post to : dhis2-us...@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-users 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 Import Log?
Hi Lars, That could indeed be the case though the interesting thing is that it was only after I created the resources tables that the import went through - using the same dataset that had failed initially when I did not do the resource tables creation. I tested this multiple times just to be sure. A caveat to that is I haven't tested this process again since I managed to make my DHIS installation use an actual database instead of an in-memory database. Will make time to test that and see what happens. Edwin On Wed, Dec 18, 2013 at 6:23 PM, Lars Helge Øverland larshe...@gmail.comwrote: Hi Edwin, there is no link between resource tables and meta-data import so I don't think that's significant. Since the logs says surname cannot be null I think that was the source of the problem - there might be a problem with the export function not including surnames, or some database integrity issues with the source database. Lars On Tue, Dec 17, 2013 at 11:10 AM, Edwin Mulwa eddi...@gmail.com wrote: Hi All, An interesting update is as follows: I removed ALL the users in the XML file and managed to import everything. This of course didn't really solve my problem because I eventually needed to import users as well. After importation, I encountered a new problem: When I tried to do data entry, the Data Sets combo box was not loading with data. Checking the log, I found the following message: ** ERROR 2013-12-17 01:00:56,744 Resource table _dataelementcategoryoptioncomboname does not exist, please generate it (HibernateDataElementStore.java [http-bio-8080-exec-9])* I found, from checking previous posts, that I needed to create resource tables from Maintenance-Data Administration; which I did. Then I decided to try and import all my metadata afresh, including the users (ensuring that all users have firstname and surname defined) and the import WORKED!! What this means is that the error I was getting telling me that the surname should not be null AFTER I had rectified the source XML file was not an accurately reported error. The error must have been something to do with missing resource tables. I think this is a potential bug in DHIS that should be investigated. Edwin On Mon, Dec 16, 2013 at 5:03 PM, Morten Olav Hansen morte...@gmail.comwrote: Hi Edwin, I'm not really sure.. if you know your way around a text-editor, you can try and remove all user but a few.. and see if it still fails, there might be a few users in there that have some errors -- Morten On Mon, Dec 16, 2013 at 2:52 PM, Edwin Mulwa eddi...@gmail.com wrote: Hi Morten, You pointed me in the right direction. Thanks. Taking a look at the log, it shows that there is a NULL value in surname field when its trying to insert a record in the userinfo table. I checked the source metadata.xml file and ensured that all surname entries have a value. I still get the same error. See attached log snippet. Any thoughts on why this is persisting even in the absence of NULL values? Edwin On Mon, Dec 16, 2013 at 4:59 AM, Edwin Mulwa eddi...@gmail.com wrote: Ok, thanks. Yes I am... On Mon, Dec 16, 2013 at 3:37 PM, Morten Olav Hansen morte...@gmail.com wrote: I would recommend looking at logs/catalina.out (assuming you are running tomcat) -- Morten On Mon, Dec 16, 2013 at 1:31 PM, Edwin Mulwa eddi...@gmail.comwrote: Hi, I am importing all metadata from one instance of DHIS2 to another. The import process seems to be hanging on the Importing Users section (see attached screenshot). Is there an import log that I can check to see what is happening? Edwin ___ 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 ___ 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 13321: (Translations)Improved French translations from Kader.
revno: 13321 committer: Jason P. Pickering jason.p.picker...@gmail.com branch nick: dhis2 timestamp: Thu 2013-12-19 10:19:12 +0200 message: (Translations)Improved French translations from Kader. modified: dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module_fr.properties dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_fr.properties dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module_fr.properties dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_fr.properties dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_fr.properties dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_fr.properties dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/resources/org/hisp/dhis/appmanager/i18n_module_fr.properties dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_fr.properties dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module_fr.properties dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_fr.properties dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module_fr.properties dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module_fr.properties dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module_fr.properties dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_fr.properties dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_fr.properties dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module_fr.properties dhis-2/dhis-web/dhis-web-mobile/src/main/resources/org/hisp/dhis/web/mobile/i18n_module_fr.properties dhis-2/dhis-web/dhis-web-pivot/src/main/resources/org/hisp/dhis/pivot/i18n_module_fr.properties dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module_fr.properties dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_fr.properties dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module_fr.properties dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module_fr.properties The size of the diff (10378 lines) is larger than your specified limit of 5000 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@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 13322: DataValue, renamed property optionCombo to categoryOptionCombo for consistency. Kept an alias get...
revno: 13322
committer: Lars Helge Øverland larshe...@gmail.com
branch nick: dhis2
timestamp: Thu 2013-12-19 09:23:37 +0100
message:
DataValue, renamed property optionCombo to categoryOptionCombo for
consistency. Kept an alias get method not to break velocity templates around.
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValue.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DeflatedDataValue.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportDataValue.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/configuration/ConfigurationDeletionHandler.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/hibernate/HibernateDataValueStore.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/DataValueSMSListener.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/J2MEDataValueSMSListener.java
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datavalue/hibernate/DataValue.hbm.xml
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/SpringDataValueSetStore.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/person/AbstractPersonService.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultImportService.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultMetaDataDependencyService.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/PersonServiceTest.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/analysis/DefaultImportAnalyser.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/RoutineDataValueRowHandler.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/SemiPermanentDataValueRowHandler.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataValueConverter.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataValueImporter.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectManager.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectService.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataValueBatchHandler.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/DataValueRowMapper.java
dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/FormUtils.java
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/utils/FormUtilsImpl.java
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/dataanalysis/EditDataValueAction.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/datavalue/DataValue.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValue.java 2013-12-14 14:47:45 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValue.java 2013-12-19 08:23:37 +
@@ -73,7 +73,7 @@
/**
* Part of the DataValue's composite ID
*/
-private DataElementCategoryOptionCombo optionCombo;
+private DataElementCategoryOptionCombo categoryOptionCombo;
private String value;
@@ -100,12 +100,12 @@
this.source = source;
}
-public DataValue( DataElement dataElement, Period period, OrganisationUnit source, DataElementCategoryOptionCombo optionCombo )
+public DataValue( DataElement dataElement, Period period, OrganisationUnit source, DataElementCategoryOptionCombo categoryOptionCombo )
{
this.dataElement = dataElement;
this.period = period;
this.source = source;
-this.optionCombo = optionCombo;
+this.categoryOptionCombo = categoryOptionCombo;
}
public DataValue( DataElement dataElement, Period period, OrganisationUnit source, String value )
@@ -116,13 +116,13 @@
Re: [Dhis2-devs] [Dhis2-users] DHIS CSV import error
This has indeed been changed lately. You can check your build number under About DHIS2 and get the latest builds from here: http://apps.dhis2.org/ci/ On Thu, Dec 19, 2013 at 9:00 AM, Maimoona Kausar maimoona.kau...@irdinformatics.org wrote: I tried exporting CSV from demo app as you explained in email above. The column for datetime of row is different in both CSVs. i.e. Column is 'timestamp' in CSV exported from my instance of DHIS, but the column name is 'lastupdated' in CSV exported from Demo app. Seems that there s some version difference. From where I can get the same app as one deployed on demo server. On Thu, Dec 19, 2013 at 12:34 PM, Maimoona Kausar maimoona.kau...@irdinformatics.org wrote: I tried importing CSV again with category undeleted, and changed the period, and values. it says 8 updated but new value is not reflected in tables. On Thu, Dec 19, 2013 at 12:26 PM, Maimoona Kausar maimoona.kau...@irdinformatics.org wrote: I deleted it because it was mentioned as non-required option. And the system from which we would get our CSV may not have category. On Thu, Dec 19, 2013 at 12:19 PM, Lars Helge Øverland larshe...@gmail.com wrote: Okay. Any idea why categoryoptioncombos are not there? On Thu, Dec 19, 2013 at 8:17 AM, Maimoona Kausar maimoona.kau...@irdinformatics.org wrote: The email above contains image for CSV data being imported. On Thu, Dec 19, 2013 at 12:14 PM, Lars Helge Øverland larshe...@gmail.com wrote: Hello Maimoona, thanks for reporting. I have tried to reproduce your problem but could not. What I did on the demo was: - Export data in CSV format for Ngelehun 2013-02-01 - 2013-04-01 for PHUF 2 form - Removed the corresponding data by simply blanking out in the data entry form - Imported the CSV file This lead to data re-appearing in the form. Some things to check: - What does your CSV file look like, does it have values, can you please post it? - If you already have data in your database and do an export, then you must remove some of it for the import to have any effect on the same database. - The CSV file is using UIDs, not database ids, category option combo id to 15 will not work. Let us know. Lars On Thu, Dec 19, 2013 at 6:42 AM, Maimoona Kausar maimoona.kau...@irdinformatics.org wrote: Hi Team, I am working with CSV import module of DHIS 2.13 live. It doesnot import any data into datavalue table. Neither does it show any row in importdatavalue/importobject tables. The CSV I am trying to import was exported using DHIS CSV export module to make sure that format is correct. Attached are images of import activity. I also tried putting ID 15 (default catergorycombination) into CSV, but it didnot help too. Please let me know if I am making some mistake in understanding the import functionality and the way it works. Many thanks, Maimoona ___ Mailing list: https://launchpad.net/~dhis2-users Post to : dhis2-us...@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-users 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
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 13323: DataValue, rationalized the constructors
revno: 13323
committer: Lars Helge Øverland larshe...@gmail.com
branch nick: dhis2
timestamp: Thu 2013-12-19 10:06:41 +0100
message:
DataValue, rationalized the constructors
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValue.java
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/FacilityReportingServiceImpl.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataValueController.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/SaveAggregateDataValueAction.java
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/SaveSectionFormAction.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/datavalue/DataValue.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValue.java 2013-12-19 08:23:37 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValue.java 2013-12-19 09:06:41 +
@@ -93,13 +93,12 @@
{
}
-public DataValue( DataElement dataElement, Period period, OrganisationUnit source )
-{
-this.dataElement = dataElement;
-this.period = period;
-this.source = source;
-}
-
+/**
+ * @param dataElement the data element.
+ * @param period the period.
+ * @param source the organisation unit.
+ * @param categoryOptionCombo the category option combo.
+ */
public DataValue( DataElement dataElement, Period period, OrganisationUnit source, DataElementCategoryOptionCombo categoryOptionCombo )
{
this.dataElement = dataElement;
@@ -108,46 +107,27 @@
this.categoryOptionCombo = categoryOptionCombo;
}
-public DataValue( DataElement dataElement, Period period, OrganisationUnit source, String value )
-{
-this.dataElement = dataElement;
-this.period = period;
-this.source = source;
-this.value = value;
-}
-
-public DataValue( DataElement dataElement, Period period, OrganisationUnit source, String value, DataElementCategoryOptionCombo categoryOptionCombo )
-{
-this.dataElement = dataElement;
-this.period = period;
-this.source = source;
-this.value = value;
-this.categoryOptionCombo = categoryOptionCombo;
-}
-
-public DataValue( DataElement dataElement, Period period, OrganisationUnit source, String value, String storedBy,
- Date timestamp, String comment )
-{
-this.dataElement = dataElement;
-this.period = period;
-this.source = source;
-this.value = value;
-this.storedBy = storedBy;
-this.timestamp = timestamp;
-this.comment = comment;
-}
-
-public DataValue( DataElement dataElement, Period period, OrganisationUnit source, String value, String storedBy,
- Date timestamp, String comment, DataElementCategoryOptionCombo categoryOptionCombo )
-{
-this.dataElement = dataElement;
-this.period = period;
-this.source = source;
-this.value = value;
-this.storedBy = storedBy;
-this.timestamp = timestamp;
-this.comment = comment;
-this.categoryOptionCombo = categoryOptionCombo;
+/**
+ * @param dataElement the data element.
+ * @param period the period.
+ * @param source the organisation unit.
+ * @param categoryOptionCombo the category option combo.
+ * @param value the value.
+ * @param storedBy the user that stored this data value.
+ * @param timestamp the time of creation of this data value.
+ * @param comment the comment.
+ */
+public DataValue( DataElement dataElement, Period period, OrganisationUnit source, DataElementCategoryOptionCombo categoryOptionCombo,
+String value, String storedBy, Date timestamp, String comment )
+{
+this.dataElement = dataElement;
+this.period = period;
+this.source = source;
+this.categoryOptionCombo = categoryOptionCombo;
+this.value = value;
+this.storedBy = storedBy;
+this.timestamp = timestamp;
+this.comment = comment;
}
// -
=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/FacilityReportingServiceImpl.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/FacilityReportingServiceImpl.java 2013-12-16 15:15:54 +
+++
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 13324: minor fix to oust
revno: 13324
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Thu 2013-12-19 10:19:44 +0100
message:
minor fix to oust
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/oust.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-commons-resources/src/main/webapp/dhis-web-commons/oust/oust.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/oust.js 2013-12-17 16:03:32 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/oust.js 2013-12-19 09:19:44 +
@@ -39,7 +39,7 @@
};
this.getSelectedUid = function() {
-return selectedOrganisationUnitUid;
+return selectedOrganisationUnit;
}
this.isSelected = function() {
___
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 13325: Minor fix.
revno: 13325
committer: Jan Henrik Overland janhenrik.overl...@gmail.com
branch nick: dhis2
timestamp: Thu 2013-12-19 10:48:29 +0100
message:
Minor fix.
modified:
dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/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-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js 2013-12-08 12:44:13 +
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js 2013-12-19 09:48:29 +
@@ -5041,9 +5041,7 @@
xtype: 'button',
text: NS.i18n.home,
handler: function() {
- //window.location.href = ns.core.init.contextPath + '/dhis-web-commons-about/redirect.action';
-
- ns.core.web.pivot.sort(ns.app.xLayout, ns.app.response, 'Uvn6LCg7dVU');
+ window.location.href = ns.core.init.contextPath + '/dhis-web-commons-about/redirect.action';
}
}
]
___
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 Import Log?
Okay thank you Edwin.. Lars On Thu, Dec 19, 2013 at 9:16 AM, Edwin Mulwa eddi...@gmail.com wrote: Hi Lars, That could indeed be the case though the interesting thing is that it was only after I created the resources tables that the import went through - using the same dataset that had failed initially when I did not do the resource tables creation. I tested this multiple times just to be sure. A caveat to that is I haven't tested this process again since I managed to make my DHIS installation use an actual database instead of an in-memory database. Will make time to test that and see what happens. Edwin On Wed, Dec 18, 2013 at 6:23 PM, Lars Helge Øverland larshe...@gmail.comwrote: Hi Edwin, there is no link between resource tables and meta-data import so I don't think that's significant. Since the logs says surname cannot be null I think that was the source of the problem - there might be a problem with the export function not including surnames, or some database integrity issues with the source database. Lars On Tue, Dec 17, 2013 at 11:10 AM, Edwin Mulwa eddi...@gmail.com wrote: Hi All, An interesting update is as follows: I removed ALL the users in the XML file and managed to import everything. This of course didn't really solve my problem because I eventually needed to import users as well. After importation, I encountered a new problem: When I tried to do data entry, the Data Sets combo box was not loading with data. Checking the log, I found the following message: ** ERROR 2013-12-17 01:00:56,744 Resource table _dataelementcategoryoptioncomboname does not exist, please generate it (HibernateDataElementStore.java [http-bio-8080-exec-9])* I found, from checking previous posts, that I needed to create resource tables from Maintenance-Data Administration; which I did. Then I decided to try and import all my metadata afresh, including the users (ensuring that all users have firstname and surname defined) and the import WORKED!! What this means is that the error I was getting telling me that the surname should not be null AFTER I had rectified the source XML file was not an accurately reported error. The error must have been something to do with missing resource tables. I think this is a potential bug in DHIS that should be investigated. Edwin On Mon, Dec 16, 2013 at 5:03 PM, Morten Olav Hansen morte...@gmail.comwrote: Hi Edwin, I'm not really sure.. if you know your way around a text-editor, you can try and remove all user but a few.. and see if it still fails, there might be a few users in there that have some errors -- Morten On Mon, Dec 16, 2013 at 2:52 PM, Edwin Mulwa eddi...@gmail.com wrote: Hi Morten, You pointed me in the right direction. Thanks. Taking a look at the log, it shows that there is a NULL value in surname field when its trying to insert a record in the userinfo table. I checked the source metadata.xml file and ensured that all surname entries have a value. I still get the same error. See attached log snippet. Any thoughts on why this is persisting even in the absence of NULL values? Edwin On Mon, Dec 16, 2013 at 4:59 AM, Edwin Mulwa eddi...@gmail.comwrote: Ok, thanks. Yes I am... On Mon, Dec 16, 2013 at 3:37 PM, Morten Olav Hansen morte...@gmail.com wrote: I would recommend looking at logs/catalina.out (assuming you are running tomcat) -- Morten On Mon, Dec 16, 2013 at 1:31 PM, Edwin Mulwa eddi...@gmail.comwrote: Hi, I am importing all metadata from one instance of DHIS2 to another. The import process seems to be hanging on the Importing Users section (see attached screenshot). Is there an import log that I can check to see what is happening? Edwin ___ 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 ___ 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 13326: implemented user account expiration
revno: 13326
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Thu 2013-12-19 12:50:58 +0100
message:
implemented user account expiration
added:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/useraccount/expired.js
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/expired.vm
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/CustomExceptionMappingAuthenticationFailureHandler.java
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/useraccount/action/ExpiredAccountAction.java
modified:
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AccountController.java
dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml
dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml
--
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-api/src/main/java/org/hisp/dhis/api/controller/AccountController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AccountController.java 2013-08-23 16:00:30 +
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AccountController.java 2013-12-19 11:50:58 +
@@ -28,13 +28,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import java.util.Collection;
-import java.util.HashSet;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
+import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -65,6 +59,17 @@
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.client.RestTemplate;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
/**
* @author Lars Helge Overland
*/
@@ -73,35 +78,37 @@
public class AccountController
{
private static final Log log = LogFactory.getLog( AccountController.class );
-
+
private static final String RECAPTCHA_VERIFY_URL = https://www.google.com/recaptcha/api/verify;;
protected static final String PUB_KEY = 6LcM6tcSANwYsFp--0SYtcnze_WdYn8XwMMk;
private static final String KEY = 6LcM6tcSAFnHo1f3lLstk3rZv3EVinNROfRq;
private static final String TRUE = true;
private static final String SPLIT = \n;
private static final int MAX_LENGTH = 80;
-
+
@Autowired
private RestTemplate restTemplate;
-
+
@Autowired
private UserService userService;
-
+
@Autowired
private AuthenticationManager authenticationManager;
-
+
@Autowired
private ConfigurationService configurationService;
-
+
@Autowired
private PasswordManager passwordManager;
-
+
@Autowired
private SecurityService securityService;
-
+
@Autowired
private SystemSettingManager systemSettingManager;
-
+
+private ObjectMapper objectMapper = new ObjectMapper();
+
@RequestMapping( value = /recovery, method = RequestMethod.POST, produces = ContextUtils.CONTENT_TYPE_TEXT )
public @ResponseBody String recoverAccount(
@RequestParam String username,
@@ -109,15 +116,15 @@
HttpServletResponse response )
{
String rootPath = ContextUtils.getContextPath( request );
-
+
if ( !systemSettingManager.accountRecoveryEnabled() )
{
response.setStatus( HttpServletResponse.SC_CONFLICT );
return Account recovery is not enabled;
}
-
+
boolean recover = securityService.sendRestoreMessage( username, rootPath );
-
+
if ( !recover )
{
response.setStatus( HttpServletResponse.SC_CONFLICT );
@@ -125,11 +132,11 @@
}
log.info( Recovery message sent for user: + username );
-
+
response.setStatus( HttpServletResponse.SC_OK );
return Recovery message sent;
}
-
+
@RequestMapping( value = /restore, method = RequestMethod.POST, produces = ContextUtils.CONTENT_TYPE_TEXT )
public @ResponseBody String restoreAccount(
@RequestParam String username,
@@ -137,42 +144,42 @@
@RequestParam String
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 13327: minor fix
revno: 13327
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Thu 2013-12-19 13:07:47 +0100
message:
minor fix
modified:
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AccountController.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-api/src/main/java/org/hisp/dhis/api/controller/AccountController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AccountController.java 2013-12-19 11:50:58 +
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AccountController.java 2013-12-19 12:07:47 +
@@ -378,6 +378,24 @@
return objectMapper.writeValueAsString( result );
}
+if ( password == null || !ValidationUtils.passwordIsValid( password ) )
+{
+response.setStatus( HttpServletResponse.SC_BAD_REQUEST );
+result.put( status, PASSWORD_INVALID );
+result.put( message, Password is not specified or invalid );
+
+return objectMapper.writeValueAsString( result );
+}
+
+if ( password.trim().equals( username.trim() ) )
+{
+response.setStatus( HttpServletResponse.SC_BAD_REQUEST );
+result.put( status, PASSWORD_EQUAL_TO_USERNAME );
+result.put( message, Password cannot be equal to username );
+
+return objectMapper.writeValueAsString( result );
+}
+
String passwordEncoded = passwordManager.encodePassword( username, password );
credentials.setPassword( passwordEncoded );
___
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 13328: change text when changing expired password
revno: 13328 committer: Morten Olav Hansen morte...@gmail.com branch nick: dhis2 timestamp: Thu 2013-12-19 13:08:56 +0100 message: change text when changing expired password modified: dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/expired.vm dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties -- 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-commons-resources/src/main/webapp/dhis-web-commons/useraccount/expired.vm' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/expired.vm 2013-12-19 11:50:58 + +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/expired.vm 2013-12-19 12:08:56 + @@ -19,7 +19,7 @@ div id=accountInput -h3span id=create_new_account$i18n.getString( change_password )/span/h3 +h3span id=create_new_account$i18n.getString( expired_password )/span/h3 form id=accountForm === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties' --- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2013-11-17 17:36:35 + +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2013-12-19 12:08:56 + @@ -124,6 +124,7 @@ show_details=Show details hide_details=Hide details change_password=Change password +expired_password=Your password has expired, please change date_selector=Choose a date hide_menu=Hide menu extend_menu=Extend menu ___ 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 13329: new system setting, allow self registration without recaptcha
revno: 13329
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Thu 2013-12-19 14:25:04 +0100
message:
new system setting, allow self registration without recaptcha
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/setting/DefaultSystemSettingManager.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AccountController.java
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/useraccount/account.js
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/account.vm
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/SystemSettingInterceptor.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetAccessSettingsAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemAccessSettings.vm
--
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/setting/SystemSettingManager.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java 2013-12-18 15:08:00 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java 2013-12-19 13:25:04 +
@@ -28,15 +28,15 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import org.hisp.dhis.period.MonthlyPeriodType;
+import org.hisp.dhis.period.QuarterlyPeriodType;
+import org.hisp.dhis.period.YearlyPeriodType;
+
import java.io.Serializable;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
-import org.hisp.dhis.period.MonthlyPeriodType;
-import org.hisp.dhis.period.QuarterlyPeriodType;
-import org.hisp.dhis.period.YearlyPeriodType;
-
/**
* @author Stian Strandli
* @version $Id: SystemSettingManager.java 4910 2008-04-15 17:55:02Z larshelg $
@@ -44,7 +44,7 @@
public interface SystemSettingManager
{
final String ID = SystemSettingManager.class.getName();
-
+
final String KEY_APPLICATION_TITLE = applicationTitle;
final String KEY_APPLICATION_INTRO = keyApplicationIntro;
final String KEY_APPLICATION_NOTIFICATION = keyApplicationNotification;
@@ -82,55 +82,61 @@
final String KEY_LAST_MONITORING_RUN = keyLastMonitoringRun;
final String KEY_GOOGLE_ANALYTICS_UA = googleAnalyticsUA;
final String KEY_CREDENTIALS_EXPIRES = credentialsExpires;
+final String KEY_SELF_REGISTRATION_NO_RECAPTCHA = keySelfRegistrationNoRecaptcha;
final String DEFAULT_SCHEDULE_AGGREGATE_QUERY_BUILDER_TASK_STRATEGY = lastMonth;
final String DEFAULT_FLAG = dhis2;
final int DEFAULT_MAX_NUMBER_OF_ATTEMPTS = 20;
final int DEFAULT_TIMEFRAME_MINUTES = 1;
final double DEFAULT_FACTOR_OF_DEVIATION = 2.0;
-final int DEFAULT_ORGUNITGROUPSET_AGG_LEVEL = 3;
+final int DEFAULT_ORGUNITGROUPSET_AGG_LEVEL = 3;
final String DEFAULT_GOOGLE_MAPS_API_KEY = ABQIut6AhySExnYIXm5s2OFIkxRKNzJ-_9njnryRTbvC6CtrS4sRvRREWnxwlZUa630pLuPf3nD9i4fq9w;
final String DEFAULT_START_MODULE = dhis-web-dashboard-integration;
final String DEFAULT_APPLICATION_TITLE = District Health Information Software 2;
-final int DEFAULT_EMAIL_PORT = 587;
+final int DEFAULT_EMAIL_PORT = 587;
final int DEFAULT_COMPLETENESS_OFFSET = 15;
final String DEFAULT_TIME_FOR_SENDING_MESSAGE = 08:00;
final String DEFAULT_CACHE_STRATEGY = CACHE_6AM_TOMORROW;
-
+
final String SYSPROP_PORTAL = runningAsPortal;
-
-final HashSetString DEFAULT_SCHEDULED_PERIOD_TYPES = new HashSetString() { {
-add( MonthlyPeriodType.NAME );
-add( QuarterlyPeriodType.NAME );
-add( YearlyPeriodType.NAME );
-} };
-
+
+final HashSetString DEFAULT_SCHEDULED_PERIOD_TYPES = new HashSetString()
+{
+{
+add( MonthlyPeriodType.NAME );
+add( QuarterlyPeriodType.NAME );
+add( YearlyPeriodType.NAME );
+}
+};
+
void saveSystemSetting( String name, Serializable value );
Serializable getSystemSetting( String name );
-
+
Serializable getSystemSetting( String name, Serializable defaultValue );
CollectionSystemSetting getAllSystemSettings();
void deleteSystemSetting( String name );
-
+
ListString getFlags();
-
+
String getFlagImage();
-
+
String
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 13330: if using msie 7, 8, 9, tag html element with corresponding class (ie7, ie8, ie9)
revno: 13330 committer: Morten Olav Hansen morte...@gmail.com branch nick: dhis2 timestamp: Thu 2013-12-19 14:49:57 +0100 message: if using msie 7,8,9, tag html element with corresponding class (ie7, ie8, ie9) modified: dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm -- 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-commons-resources/src/main/webapp/main.vm' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm 2013-12-18 11:53:56 + +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm 2013-12-19 13:49:57 + @@ -1,5 +1,8 @@ !DOCTYPE HTML -html#if( $manifest ) manifest=$manifest#end +!--[if IE 7]html #if( $manifest ) manifest=$manifest #end class=ie7![endif]-- +!--[if IE 8]html #if( $manifest ) manifest=$manifest #end class=ie8![endif]-- +!--[if IE 9]html #if( $manifest ) manifest=$manifest #end class=ie9![endif]-- +![if !IE]html #if( $manifest ) manifest=$manifest #end![endif] head title$encoder.htmlEncode( $applicationTitle )/title meta name=description content=DHIS 2 ___ 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 13331: ouwt fixes for ie8, only memory-only storage if ie7, 8. Makes ouwt slow, but working in ie8.
revno: 13331
committer: Morten Olav Hansen morte...@gmail.com
branch nick: dhis2
timestamp: Thu 2013-12-19 15:36:41 +0100
message:
ouwt fixes for ie8, only memory-only storage if ie7,8. Makes ouwt slow, but
working in ie8.
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.storage.memory.js
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/ouwt.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-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.storage.memory.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.storage.memory.js 2013-12-03 09:49:28 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.storage.memory.js 2013-12-19 14:36:41 +
@@ -158,12 +158,9 @@
value: function ( store, arr ) {
var self = this;
var deferred = $.Deferred();
-var chained = deferred.then();
$.each( arr, function ( idx, item ) {
-chained = chained.then( function () {
-return self.set( store, item );
-} );
+self.set( store, item );
} );
deferred.resolveWith( this );
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/ouwt.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/ouwt.js 2013-12-09 21:32:59 +
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/ouwt.js 2013-12-19 14:36:41 +
@@ -32,24 +32,40 @@
var OU_USERNAME_KEY = ouUsername;
var OU_SELECTED_KEY = ouSelected;
-dhis2.ou.store = new dhis2.storage.Store( {
-name: OU_STORE_NAME,
-objectStores: [ {
- name: OU_KEY,
- adapters: [ dhis2.storage.IndexedDBAdapter, dhis2.storage.DomLocalStorageAdapter, dhis2.storage.InMemoryAdapter ]
-}, {
- name: OU_PARTIAL_KEY,
- adapters: [ dhis2.storage.IndexedDBAdapter, dhis2.storage.DomSessionStorageAdapter, dhis2.storage.InMemoryAdapter ]
+dhis2.ou.store = null;
+dhis2.ou.memoryOnly = $('html').hasClass('ie7') || $('html').hasClass('ie8');
+
+$(function ()
+{
+var adapters = [];
+var partial_adapters = [];
+
+if( dhis2.ou.memoryOnly ) {
+adapters = [ dhis2.storage.InMemoryAdapter ];
+partial_adapters = [ dhis2.storage.InMemoryAdapter ];
+} else {
+adapters = [ dhis2.storage.IndexedDBAdapter, dhis2.storage.DomLocalStorageAdapter, dhis2.storage.InMemoryAdapter ];
+partial_adapters = [ dhis2.storage.IndexedDBAdapter, dhis2.storage.DomSessionStorageAdapter, dhis2.storage.InMemoryAdapter ];
}
-]
-} );
-
-$( document ).ready( function ()
-{
+
+dhis2.ou.store = new dhis2.storage.Store({
+name: OU_STORE_NAME,
+objectStores: [
+{
+name: OU_KEY,
+adapters: adapters
+},
+{
+name: OU_PARTIAL_KEY,
+adapters: partial_adapters
+}
+]
+});
+
dhis2.ou.store.open().done( function() {
selection.load();
} );
-} );
+});
// -
// Selection
@@ -125,6 +141,10 @@
};
this.getVersion = function() {
+if(dhis2.ou.memoryOnly) {
+return -1;
+}
+
return localStorage[ OU_VERSION_KEY ] ? localStorage[ OU_VERSION_KEY ] : 0;
};
@@ -304,14 +324,17 @@
}
} ).always( function() {
if( should_update ) {
+console.log('update');
selection.ajaxOrganisationUnits( false ).done(function( data ) {
selection.setRoots( data.roots );
selection.setVersion( data.version );
selection.setUsername( data.username );
+
selection.setOrganisationUnits( data.organisationUnits ).done(function() {
sync_and_reload();
$( #orgUnitTree ).trigger( ouwtLoaded );
});
+
} ).fail( function() {
sync_and_reload();
$( #orgUnitTree ).trigger( ouwtLoaded );
___
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 1258085] Re: ie8-ouwt-stack-overflow
** Changed in: dhis2 Status: Confirmed = Fix Committed -- You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. https://bugs.launchpad.net/bugs/1258085 Title: ie8-ouwt-stack-overflow Status in DHIS 2: Fix Committed Bug description: When using IE8, the OUWT offline tree will only support a small number of organisation units. Unsure if its local-storage issues, or something else, but it should be resolved for 2.14 (and probably backported for 2.13) To manage notifications about this bug go to: https://bugs.launchpad.net/dhis2/+bug/1258085/+subscriptions ___ 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] [Dhis2-users] GML Import not displaying under org units
Thank you, could you please help with this format? I am thinking of just editing the xml i got using the web api resources, I want to edit it and then send it in using curl. Asides this, how do I get to delete all these imported org units and coordinates? Reason being that when ever I try to create these imported coordinates that created this org units, it tells me that there name already exist. Many thanks. Adedayo BlackBerry: 3114F90C Phone: 08028851441, 08035560463 emails: deemo...@yahoo.com, addyr...@yahoo.com Yahoo IM: deemoyes Facebook: pharael twitter:pharaell On Thursday, December 19, 2013 3:10 PM, Dayo Adeyomoye deemo...@yahoo.com wrote: Thanks, I am sure DXF2 means DHIS2 Xchange Format right? how do I do this. I am thinking of using the Meta-data import tool after creating my xml file using curl. What do you think? BlackBerry: 3114F90C Phone: 08028851441, 08035560463 emails: deemo...@yahoo.com, addyr...@yahoo.com Yahoo IM: deemoyes Facebook: pharael twitter:pharaell On Wednesday, December 18, 2013 5:18 PM, Knut Staring knu...@gmail.com wrote: Hi Dayo, Unfortunately, it does not quite work with just the level, you also have to specify the PARENT. Sent from my mobile On 18 Dec 2013 17:09, Dayo Adeyomoye deemo...@yahoo.com wrote: Dear All, I imported GML file into DHIS2 for coordinates without having the org units there already as they are many (775). This import was successful but I did not find this org units under the org unit tree. I know DHIS2 allows only 1 org unit at the level 1, so I did a meta data export of only org units and found that this imported org units from GML are all on level 1, perhaps the reason for not showing up. I then opened this xml file using an xml editor to replaced all level=1 org units to be level=2 and then returned the master org unit to level=1 since the replace all would have also changed it. I imported this file, which was also successful but I still can not find this org units, reason probably being that no change was effected in the database because when I do an export again and access the xml file, the changes I made and imported does not reflect. It gives me the same old export. Thanks BlackBerry: 3114F90C Phone: 08028851441, 08035560463 emails: deemo...@yahoo.com, addyr...@yahoo.com Yahoo IM: deemoyes Facebook: pharael twitter:pharaell ___ Mailing list: https://launchpad.net/~dhis2-users Post to : dhis2-us...@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-users 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] [Dhis2-users] GML Import not displaying under org units
Hi Dayo, I personally think the easiest way is to create your DXF2 (that is the XML format of DHIS2) for the hierarchy first as you wish. There are many different ways to do this. I personally use the R programming language, but I am sure others use things like Python, Java, etc. It really makes little difference how you chose to do it. I have also used PostGIS in the past to directly inject the geographical data into the organisationunit table, although this approach should be handled carefully. So short story is, there are many different approaches, and may depend on which tools you are most comfortable with. Once the hierarchy has been created and imported, you can them use the GML import to get in the coordinates. This is really only a convenience mechanism, because normally you are exporting from a shape file to GML and there are lots of tools to this. The advantage of importing via GML as well, is that DHIS2 will truncate the precision of your coordinates to four decimal places, which can be a bit tricky otherwise. It is a bit trickier now that names in DHIS2 are not unique, so you should probably use the code field to match on. But if you want to pursue the pure DXF route, you would need to be sure that your geographical data is in GeoJSON format, and that you add a node in the DXF featureType which would correspond to either Polygon or Point, along with valid GeoJSON formatted data to the coordinates node. Hope this helps. Best regards, Jason On Thu, Dec 19, 2013 at 5:15 PM, Dayo Adeyomoye deemo...@yahoo.com wrote: Thank you, could you please help with this format? I am thinking of just editing the xml i got using the web api resources, I want to edit it and then send it in using curl. Asides this, how do I get to delete all these imported org units and coordinates? Reason being that when ever I try to create these imported coordinates that created this org units, it tells me that there name already exist. Many thanks. Adedayo BlackBerry: 3114F90C Phone: 08028851441, 08035560463 emails: deemo...@yahoo.com, addyr...@yahoo.com Yahoo IM: deemoyes Facebook: pharael twitter:pharaell On Thursday, December 19, 2013 3:10 PM, Dayo Adeyomoye deemo...@yahoo.com wrote: Thanks, I am sure DXF2 means DHIS2 Xchange Format right? how do I do this. I am thinking of using the Meta-data import tool after creating my xml file using curl. What do you think? BlackBerry: 3114F90C Phone: 08028851441, 08035560463 emails: deemo...@yahoo.com, addyr...@yahoo.com Yahoo IM: deemoyes Facebook: pharael twitter:pharaell On Wednesday, December 18, 2013 5:18 PM, Knut Staring knu...@gmail.com wrote: Hi Dayo, Unfortunately, it does not quite work with just the level, you also have to specify the PARENT. Sent from my mobile On 18 Dec 2013 17:09, Dayo Adeyomoye deemo...@yahoo.com wrote: Dear All, I imported GML file into DHIS2 for coordinates without having the org units there already as they are many (775). This import was successful but I did not find this org units under the org unit tree. I know DHIS2 allows only 1 org unit at the level 1, so I did a meta data export of only org units and found that this imported org units from GML are all on level 1, perhaps the reason for not showing up. I then opened this xml file using an xml editor to replaced all level=1 org units to be level=2 and then returned the master org unit to level=1 since the replace all would have also changed it. I imported this file, which was also successful but I still can not find this org units, reason probably being that no change was effected in the database because when I do an export again and access the xml file, the changes I made and imported does not reflect. It gives me the same old export. Thanks BlackBerry: 3114F90C Phone: 08028851441, 08035560463 emails: deemo...@yahoo.com, addyr...@yahoo.com Yahoo IM: deemoyes Facebook: pharael twitter:pharaell ___ Mailing list: https://launchpad.net/~dhis2-users Post to : dhis2-us...@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-users 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 13332: Updated to uid for org unit in validation
revno: 13332
committer: Lars Helge Øverland larshe...@gmail.com
branch nick: dhis2
timestamp: Thu 2013-12-19 17:51:00 +0100
message:
Updated to uid for org unit in validation
modified:
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/RunValidationAction.java
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/dataanalysis/MarkForFollowupAction.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-validationrule/src/main/java/org/hisp/dhis/validationrule/action/RunValidationAction.java'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/RunValidationAction.java 2013-11-10 10:00:19 +
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/RunValidationAction.java 2013-12-19 16:51:00 +
@@ -87,9 +87,9 @@
// Input/output
// -
-private Integer organisationUnitId;
+private String organisationUnitId;
-public void setOrganisationUnitId( Integer organisationUnitId )
+public void setOrganisationUnitId( String organisationUnitId )
{
this.organisationUnitId = organisationUnitId;
}
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/dataanalysis/MarkForFollowupAction.java'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/dataanalysis/MarkForFollowupAction.java 2013-08-23 16:05:01 +
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/dataanalysis/MarkForFollowupAction.java 2013-12-19 16:51:00 +
@@ -144,7 +144,7 @@
OrganisationUnit source = organisationUnitService.getOrganisationUnit( sourceId );
DataElementCategoryOptionCombo categoryOptionCombo = categoryService.getDataElementCategoryOptionCombo( categoryOptionComboId );
-DataValue dataValue = dataValueService.getDataValue( source, dataElement, period, categoryOptionCombo );
+DataValue dataValue = dataValueService.getDataValue( dataElement, period, source, categoryOptionCombo );
if ( dataValue != null )
{
___
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 13333: Minor
revno: 1
committer: Lars Helge Øverland larshe...@gmail.com
branch nick: dhis2
timestamp: Thu 2013-12-19 18:45:25 +0100
message:
Minor
modified:
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/dataanalysis/MarkForFollowupAction.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-validationrule/src/main/java/org/hisp/dhis/validationrule/action/dataanalysis/MarkForFollowupAction.java'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/dataanalysis/MarkForFollowupAction.java 2013-12-19 16:51:00 +
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/dataanalysis/MarkForFollowupAction.java 2013-12-19 17:45:25 +
@@ -144,7 +144,7 @@
OrganisationUnit source = organisationUnitService.getOrganisationUnit( sourceId );
DataElementCategoryOptionCombo categoryOptionCombo = categoryService.getDataElementCategoryOptionCombo( categoryOptionComboId );
-DataValue dataValue = dataValueService.getDataValue( dataElement, period, source, categoryOptionCombo );
+DataValue dataValue = dataValueService.getDataValue( source, dataElement, period, categoryOptionCombo );
if ( dataValue != null )
{
___
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 13335: Impl support for saving single data values with attribute option combo in web api. Re-arranaged m...
revno: 13335
committer: Lars Helge Øverland larshe...@gmail.com
branch nick: dhis2
timestamp: Fri 2013-12-20 00:00:15 +0100
message:
Impl support for saving single data values with attribute option combo in web
api. Re-arranaged methods in category service a bit.
added:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/CategoryOptionComboStore.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateCategoryOptionComboStore.java
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GenericDimensionalObjectStore.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueService.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryService.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/DefaultDataValueService.java
dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementCategoryOptionComboStoreTest.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataValueController.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/common/GenericDimensionalObjectStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GenericDimensionalObjectStore.java 2013-08-23 15:56:19 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GenericDimensionalObjectStore.java 2013-12-19 23:00:15 +
@@ -39,5 +39,5 @@
public interface GenericDimensionalObjectStoreT
extends GenericIdentifiableObjectStoreT
{
-CollectionT getByConcept(Concept concept);
+CollectionT getByConcept( Concept concept );
}
=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/CategoryOptionComboStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/CategoryOptionComboStore.java 1970-01-01 00:00:00 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/CategoryOptionComboStore.java 2013-12-19 23:00:15 +
@@ -0,0 +1,42 @@
+package org.hisp.dhis.dataelement;
+
+/*
+ * Copyright (c) 2004-2013, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import java.util.Set;
+
+import org.hisp.dhis.common.GenericIdentifiableObjectStore;
+
+/**
+ * @author Lars Helge Overland
+ */
+public interface CategoryOptionComboStore
+extends GenericIdentifiableObjectStoreDataElementCategoryOptionCombo
+{
+DataElementCategoryOptionCombo getCategoryOptionCombo( DataElementCategoryCombo categoryCombo, SetDataElementCategoryOption categoryOptions );
+}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryService.java 2013-08-23 15:56:19 +
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryService.java 2013-12-19 23:00:15 +
@@ -30,6 +30,7 @@
import java.util.Collection;
import java.util.Map;
+import java.util.Set;
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 13336: Minor
revno: 13336
committer: Lars Helge Øverland larshe...@gmail.com
branch nick: dhis2
timestamp: Fri 2013-12-20 00:08:40 +0100
message:
Minor
modified:
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataValueController.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-api/src/main/java/org/hisp/dhis/api/controller/DataValueController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataValueController.java 2013-12-19 23:00:15 +
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataValueController.java 2013-12-19 23:08:40 +
@@ -163,7 +163,7 @@
{
DataElementCategoryOption categoryOption = categoryService.getDataElementCategoryOption( id );
-if ( categoryOption != null )
+if ( categoryOption == null )
{
ContextUtils.conflictResponse( response, Illegal category option identifier: + id );
return;
___
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-documenters/dhis2/dhis2-docbook-docs] Rev 884: Data values
revno: 884 committer: Lars Helge Øverland larshe...@gmail.com branch nick: dhis2-docbook-docs timestamp: Fri 2013-12-20 00:16:12 +0100 message: Data values modified: src/docbkx/en/dhis2_user_man_web_api.xml src/docbkx/en/dhis2_user_manual_en.xml -- lp:~dhis2-documenters/dhis2/dhis2-docbook-docs https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs Your team DHIS 2 developers is subscribed to branch lp:~dhis2-documenters/dhis2/dhis2-docbook-docs. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs/+edit-subscription === modified file 'src/docbkx/en/dhis2_user_man_web_api.xml' --- src/docbkx/en/dhis2_user_man_web_api.xml 2013-12-18 09:40:58 + +++ src/docbkx/en/dhis2_user_man_web_api.xml 2013-12-19 23:16:12 + @@ -699,8 +699,8 @@ titleData values query parameters/title tgroup cols=3 colspec colname=c1 colnum=1 colwidth=1*/ -colspec colname=c2 colnum=2 colwidth=1.59*/ -colspec colname=c3 colnum=3 colwidth=3.16*/ +colspec colname=c2 colnum=2 colwidth=1.23*/ +colspec colname=c3 colnum=3 colwidth=4.08*/ thead row entryQuery parameter/entry @@ -715,19 +715,29 @@ entryData element identifier/entry /row row +entrype/entry +entryYes/entry +entryPeriod identifier/entry + /row + row +entryou/entry +entryYes/entry +entryOrganisation unit identifier/entry + /row + row entryco/entry entryNo/entry entryCategory option combo identifier, default will be used if omitted/entry /row row -entrype/entry -entryYes/entry -entryPeriod identifier/entry +entrycc/entry +entryNo (must combine with cp)/entry +entryAttribute combo identifier/entry /row row -entryou/entry -entryYes/entry -entryOrganisation unit identifier/entry +entrycp/entry +entryNo (must combine with cc)/entry +entryAttribute option identifiers, can be repeated multiple times/entry /row row entryvalue/entry @@ -752,7 +762,12 @@ Conflict/emphasis status code and descriptive text message. If the operation lead to a saved or updated value, emphasis role=italic200 OK/emphasis will be returned. An example of a request looks like this:/para -screencurl http://apps.dhis2.org/demo/api/dataValues?de=s46m5MS0hxuamp;co=Prlt0C1RF0samp;pe=201301amp;ou=DiszpKrYNg8amp;value=12; -X POST -u admin:district -v/screen +screencurl http://apps.dhis2.org/demo/api/dataValues?de=s46m5MS0hxuamp;pe=201301amp;ou=DiszpKrYNg8amp;co=Prlt0C1RF0samp;value=12; -X POST -u admin:district -v/screen +paraThis resource also allows a special syntax for associating the value to an attribute + option combination. This can be done by sending the identifier of the attribute combination, + together with the identifier(s) of the attribute option(s) which the value represents within + the combination. An example looks like this:/para +screencurl http://apps.dhis2.org/demo/api/dataValues?de=s46m5MS0hxuamp;ou=DiszpKrYNg8amp;pe=201308amp;cc=dzjKKQq0cSOamp;cp=wbrDrL2aYEcamp;cp=btOyqprQ9e8amp;value=26; -X POST -u admin:district -v/screen /section section titleReading data values/title === modified file 'src/docbkx/en/dhis2_user_manual_en.xml' --- src/docbkx/en/dhis2_user_manual_en.xml 2013-10-02 14:52:27 + +++ src/docbkx/en/dhis2_user_manual_en.xml 2013-12-19 23:16:12 + @@ -1,5 +1,5 @@ ?xml version='1.0' encoding='UTF-8'? -!-- This document was created with Syntext Serna Free. --!DOCTYPE book PUBLIC -//OASIS//DTD DocBook XML V4.4//EN http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd; [ +!DOCTYPE book PUBLIC -//OASIS//DTD DocBook XML V4.4//EN http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd; [ !ENTITY version '2.X' !ENTITY title 'DHIS2 User Manual' ] @@ -33,9 +33,7 @@ xi:include xmlns:xi=http://www.w3.org/2001/XInclude; href=dhis2_user_man_persons_and_programs.xml encoding=UTF-8/ xi:include xmlns:xi=http://www.w3.org/2001/XInclude; href=dhis2_user_man_web_api.xml/ xi:include xmlns:xi=http://www.w3.org/2001/XInclude; href=dhis2_user_man_apps.xml/ -!-- - xi:include xmlns:xi=http://www.w3.org/2001/XInclude; href=dhis2_user_man_excel_reports.xml encoding=UTF-8/ - -- appendix + appendix title DHIS 2 Documentation Guide/title xi:include xmlns:xi=http://www.w3.org/2001/XInclude; href=dhis2_documentation_guide.xml encoding=UTF-8 xpointer=docs_1/ xi:include xmlns:xi=http://www.w3.org/2001/XInclude; href=dhis2_documentation_guide.xml encoding=UTF-8 xpointer=docs_2/
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 13337: enable re-import button for unhandled sms
revno: 13337
committer: Long Long@Long-Laptop
branch nick: dhis2
timestamp: Fri 2013-12-20 11:29:12 +0700
message:
enable re-import button for unhandled sms
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/receiveSMSPage.vm
--
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-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/receiveSMSPage.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/receiveSMSPage.vm 2013-12-13 07:04:37 +
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/receiveSMSPage.vm 2013-12-20 04:29:12 +
@@ -270,7 +270,7 @@
td$senderNames.get($velocityCount)/td
td$incomingSms.status/td
td$incomingSms.sentDate.toLocaleString()/td
-td style=text-align:center#if($incomingSms.status == 'FAILED' || $incomingSms.status == 'INCOMING')a href=javascript:reimport('$i18n.getString( 'reimport_confirm' )','$incomingSms.id') Re-import /a #else None #end/td
+td style=text-align:center#if($incomingSms.status == 'FAILED' || $incomingSms.status == 'INCOMING' || $incomingSms.status == 'UNHANDLED')a href=javascript:reimport('$i18n.getString( 'reimport_confirm' )','$incomingSms.id') Re-import /a #else None #end/td
td style=text-align:centera href=javascript:removeSingleItem( '$incomingSms.id', '$incomingSms.getText()' ) title=$i18n.getString( 'remove' )img src=../images/delete.png alt=$i18n.getString( 'remove' )//td
/tr
#end
___
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] [Dhis2-users] DHIS CSV import error
Thanks Knut. So after trying different patterns it appears that problem occurs when selected option is dryrun=yes. Whatever data is, whatever combination is, it always flags successful import, which, in actual, is not. However, when I tried dryrun=no it successfully imported data, which was available in datavalue table too. I tried the version here http://apps.dhis2.org/ci/job/dhis-trunk/ . But in this version there is minor bug that is on exporting (CSV) any data it shows FALSE in comments column (that must be of followup column) . Many thanks, Maimoona. On Thu, Dec 19, 2013 at 1:43 PM, Knut Staring knu...@gmail.com wrote: This has indeed been changed lately. You can check your build number under About DHIS2 and get the latest builds from here: http://apps.dhis2.org/ci/ On Thu, Dec 19, 2013 at 9:00 AM, Maimoona Kausar maimoona.kau...@irdinformatics.org wrote: I tried exporting CSV from demo app as you explained in email above. The column for datetime of row is different in both CSVs. i.e. Column is 'timestamp' in CSV exported from my instance of DHIS, but the column name is 'lastupdated' in CSV exported from Demo app. Seems that there s some version difference. From where I can get the same app as one deployed on demo server. On Thu, Dec 19, 2013 at 12:34 PM, Maimoona Kausar maimoona.kau...@irdinformatics.org wrote: I tried importing CSV again with category undeleted, and changed the period, and values. it says 8 updated but new value is not reflected in tables. On Thu, Dec 19, 2013 at 12:26 PM, Maimoona Kausar maimoona.kau...@irdinformatics.org wrote: I deleted it because it was mentioned as non-required option. And the system from which we would get our CSV may not have category. On Thu, Dec 19, 2013 at 12:19 PM, Lars Helge Øverland larshe...@gmail.com wrote: Okay. Any idea why categoryoptioncombos are not there? On Thu, Dec 19, 2013 at 8:17 AM, Maimoona Kausar maimoona.kau...@irdinformatics.org wrote: The email above contains image for CSV data being imported. On Thu, Dec 19, 2013 at 12:14 PM, Lars Helge Øverland larshe...@gmail.com wrote: Hello Maimoona, thanks for reporting. I have tried to reproduce your problem but could not. What I did on the demo was: - Export data in CSV format for Ngelehun 2013-02-01 - 2013-04-01 for PHUF 2 form - Removed the corresponding data by simply blanking out in the data entry form - Imported the CSV file This lead to data re-appearing in the form. Some things to check: - What does your CSV file look like, does it have values, can you please post it? - If you already have data in your database and do an export, then you must remove some of it for the import to have any effect on the same database. - The CSV file is using UIDs, not database ids, category option combo id to 15 will not work. Let us know. Lars On Thu, Dec 19, 2013 at 6:42 AM, Maimoona Kausar maimoona.kau...@irdinformatics.org wrote: Hi Team, I am working with CSV import module of DHIS 2.13 live. It doesnot import any data into datavalue table. Neither does it show any row in importdatavalue/importobject tables. The CSV I am trying to import was exported using DHIS CSV export module to make sure that format is correct. Attached are images of import activity. I also tried putting ID 15 (default catergorycombination) into CSV, but it didnot help too. Please let me know if I am making some mistake in understanding the import functionality and the way it works. Many thanks, Maimoona ___ Mailing list: https://launchpad.net/~dhis2-users Post to : dhis2-us...@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-users 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
