[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16344: remove start/end date (dd) from fiscal periods on server side (matches client side)
revno: 16344 committer: Morten Olav Hansen morte...@gmail.com branch nick: dhis2 timestamp: Fri 2014-08-08 13:38:03 +0700 message: remove start/end date (dd) from fiscal periods on server side (matches client side) modified: dhis-2/dhis-services/dhis-service-core/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-services/dhis-service-core/src/main/resources/i18n_global.properties' --- dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties 2014-07-25 17:08:40 + +++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties 2014-08-08 06:38:03 + @@ -230,10 +230,10 @@ format.Survey.endDate = format.Relative.startDate=-MM-dd '- ' format.Relative.endDate=-MM-dd -format.FinancialApril.startDate=dd MMM 'to ' -format.FinancialApril.endDate= dd MMM -format.FinancialJuly.startDate=dd MMM 'to ' -format.FinancialJuly.endDate= dd MMM +format.FinancialApril.startDate=MMM 'to ' +format.FinancialApril.endDate=MMM +format.FinancialJuly.startDate=MMM 'to ' +format.FinancialJuly.endDate=MMM format.FinancialOct.startDate='FY ' format.FinancialOct.endDate= ___ 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 16346: updated i18nformat to use system calender for format patterns
revno: 16346 committer: Morten Olav Hansen morte...@gmail.com branch nick: dhis2 timestamp: Fri 2014-08-08 14:44:29 +0700 message: updated i18nformat to use system calender for format patterns modified: dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/AbstractCalendar.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/Calendar.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/i18n/I18nFormat.java dhis-2/dhis-services/dhis-service-core/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-api/src/main/java/org/hisp/dhis/calendar/AbstractCalendar.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/AbstractCalendar.java 2014-06-06 12:39:37 + +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/AbstractCalendar.java 2014-08-08 07:44:29 + @@ -116,6 +116,15 @@ } @Override +public String formattedDate( String dateFormat, DateUnit dateUnit ) +{ +return dateFormat +.replace( , String.format( %04d, dateUnit.getYear() ) ) +.replace( MM, String.format( %02d, dateUnit.getMonth() ) ) +.replace( dd, String.format( %02d, dateUnit.getDay() ) ); +} + +@Override public String formattedIsoDate( DateUnit dateUnit ) { dateUnit = toIso( dateUnit ); === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/Calendar.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/Calendar.java 2014-05-20 08:28:55 + +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/Calendar.java 2014-08-08 07:44:29 + @@ -71,6 +71,16 @@ String formattedDate( DateUnit dateUnit ); /** + * Formats dateUnit using supplied date format + * + * @param dateFormat Date format to use + * @param dateUnit DateUnit representing local year, month, day + * @return Default date format + * @see #getDateFormat() + */ +String formattedDate( String dateFormat, DateUnit dateUnit ); + +/** * Formats dateUnit using dateFormat and ISO 8601 * * @param dateUnit DateUnit representing local year, month, day === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/i18n/I18nFormat.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/i18n/I18nFormat.java 2014-03-18 08:10:10 + +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/i18n/I18nFormat.java 2014-08-08 07:44:29 + @@ -28,6 +28,11 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import org.hisp.dhis.calendar.DateUnit; +import org.hisp.dhis.period.Period; +import org.hisp.dhis.period.PeriodType; +import org.hisp.dhis.period.WeeklyPeriodType; + import java.text.DateFormat; import java.text.DateFormatSymbols; import java.text.DecimalFormat; @@ -36,9 +41,6 @@ import java.util.Date; import java.util.ResourceBundle; -import org.hisp.dhis.period.Period; -import org.hisp.dhis.period.WeeklyPeriodType; - /** * @author Pham Thi Thuy * @author Nguyen Dang Quang @@ -49,12 +51,12 @@ private static final DecimalFormat FORMAT_VALUE = new DecimalFormat( #.# ); // Fixed for now private static final String EMPTY = ; private static final String NAN = NaN; -private static final String INVALID_DATE=Invalid date format; - +private static final String INVALID_DATE = Invalid date format; + public static final String FORMAT_DATE = -MM-dd; public static final String FORMAT_TIME = HH:mm; public static final String FORMAT_DATETIME = -MM-dd HH:mm; - + private ResourceBundle resourceBundle; public I18nFormat( ResourceBundle resourceBundle ) @@ -88,16 +90,48 @@ String[] shortWeekdays = { weekday.short.sunday, weekday.short.monday, weekday.short.tuesday, weekday.short.wednesday, weekday.short.thursday, weekday.short.friday, weekday.short.saturday }; +String calendarName = PeriodType.getCalendar().name() + .; + for ( int i = 0; i 12; ++i ) { -months[i] = resourceBundle.getString( months[i] ); -shortMonths[i] = resourceBundle.getString( shortMonths[i] ); +if ( resourceBundle.containsKey( calendarName + months[i] ) ) +{ +months[i] = resourceBundle.getString( calendarName + months[i] ); +} +else +{ +months[i] = resourceBundle.getString( months[i] ); +} + +if ( resourceBundle.containsKey( calendarName + shortMonths[i] ) ) +{ +shortMonths[i] = resourceBundle.getString( calendarName + shortMonths[i] ); +} +else +{ +shortMonths[i] =
Re: [Dhis2-devs] Problem with resetting password on 2.15
Hi Elmarie, Did you try this again? did you manage to get it working? We have had reports of this happening one time before, but I could never reproduce it here locally.. Could you tell me more about your setup? exact dhis version, browser, did you clear the cache etc. Did the column users.passwordlastupdated get updated? If this happens, and locks people out, probably the simplest solution is to simple set passwordlastupdated to todays date (but please try on test server). -- Morten On Wed, Aug 6, 2014 at 4:16 PM, Elmarie Claasen elma...@hisp.org wrote: Thanks Knut we will try this. Regards, *Elmarie Claasen* [image: Hisp logo] Project Manager Health Information Systems Programme Tel: 041-367 1027 Cell: 082 374 2209 E-mail: elma...@hisp.org Skype: elmarie.claasen52 *From:* Knut Staring [mailto:knu...@gmail.com] *Sent:* 06 August 2014 10:41 AM *To:* Elmarie Claasen *Cc:* DHIS 2 developers *Subject:* Re: [Dhis2-devs] Problem with resetting password on 2.15 Hi Elmarie, This is just a partial solution, but hopefully will restore your access to the system. Assuming you have direct access to the database (on the command line or through PgAdmin), you can run the following: update users set password = '48e8f1207baef1ef7fe478a57d19f2e5' where username = 'admin' This should enable you to log in with the default admin/district. But of course you should then proceed to change this password. Knut On Wed, Aug 6, 2014 at 10:28 AM, Elmarie Claasen elma...@hisp.org wrote: Hi all, We have a problem with a database in which we activated the option that passwords must be reset every x months. Suddenly all of the Superusers are getting a message to reset the password which you follow and ‘save’ but saving does not log you into the database. When you go back to the login screen try to log in with the new password it says incorrect password because it evidently did not save the password. When you use the old password you simply get the same message to change your password. The database is on 2.15. We are now effectively logged out of the database – please help! Regards, *Elmarie Claasen* [image: Hisp logo] Project Manager Health Information Systems Programme Tel: 041-367 1027 Cell: 082 374 2209 E-mail: elma...@hisp.org Skype: elmarie.claasen52 ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp -- Knut Staring Dept. of Informatics, University of Oslo +4791880522 http://dhis2.org ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs] [Bug 1331983] [NEW] orgunit-tree-is-incorrectly-persisted-after-editing-user-V2
Hi, Could you try and reproduce this on a 2.16 instance? I don't see the issue here. Also, pt 11 I can't reproduce, since there is nothing called select in group when you edit the user, you can only select a specific set of org-units. -- Morten On Thu, Jun 19, 2014 at 4:04 PM, Robin Martens mart...@sher.be wrote: Public bug reported: I've copied the bug description from bug #891005 from 2011 as I have exactly the same issue. The only way to regain access to the full orgunit tree for the admin seems to be a backup recovery. --- Hi Morten , I have tried to describe steps to reproduce this bug. I think the procedure will work, but it took me some time to figure out how to reproduce it! 1)Login as admin 2)Add a new user test_user1 3)Assing Data entry clerk 4)Assign Badija 5)Press Add 6)Add a new user test_user2 7)Assing Data entry clerk 8)Assign Badija 9)Press Add 10)From the main user screen, edit the test_user1 11)Press Bo city council, Select in group 12)Press Save. 13)Edit the test_user2 . The orgunit tree which is displayed is not the full orgunit tree of the current user (admin) but rather the orgunit tree of test_user1 which had been edited in the previous step. It is expected that what would be shown would be the full orgunit tree from the admin user Extra credit: Edit the orgunits for the admin user by clicking a few which are displayed and press Save Log off and login again. Go to Maintenance-Orgunits. The only orgunits which are displayed are the ones which have been assigned with no way to recover the full orgunit tree, without direct manipulation of usermemberships by SQL (DELETE FROM usermembership where userinfoid = 13;) It would be expected that the admin user should always have access to the full orgunit tree regardless of what orgunits have been assigned to this user (or that the assignment, and hence data entry capability) of the admin user should be disallowed (a la DHIS 1.4) or allowed regardless of which orgunits have actually been assigned. ** Affects: dhis2 Importance: Undecided Status: New -- You received this bug notification because you are subscribed to DHIS. https://bugs.launchpad.net/bugs/1331983 Title: orgunit-tree-is-incorrectly-persisted-after-editing-user-V2 Status in DHIS 2: New Bug description: I've copied the bug description from bug #891005 from 2011 as I have exactly the same issue. The only way to regain access to the full orgunit tree for the admin seems to be a backup recovery. --- Hi Morten , I have tried to describe steps to reproduce this bug. I think the procedure will work, but it took me some time to figure out how to reproduce it! 1)Login as admin 2)Add a new user test_user1 3)Assing Data entry clerk 4)Assign Badija 5)Press Add 6)Add a new user test_user2 7)Assing Data entry clerk 8)Assign Badija 9)Press Add 10)From the main user screen, edit the test_user1 11)Press Bo city council, Select in group 12)Press Save. 13)Edit the test_user2 . The orgunit tree which is displayed is not the full orgunit tree of the current user (admin) but rather the orgunit tree of test_user1 which had been edited in the previous step. It is expected that what would be shown would be the full orgunit tree from the admin user Extra credit: Edit the orgunits for the admin user by clicking a few which are displayed and press Save Log off and login again. Go to Maintenance-Orgunits. The only orgunits which are displayed are the ones which have been assigned with no way to recover the full orgunit tree, without direct manipulation of usermemberships by SQL (DELETE FROM usermembership where userinfoid = 13;) It would be expected that the admin user should always have access to the full orgunit tree regardless of what orgunits have been assigned to this user (or that the assignment, and hence data entry capability) of the admin user should be disallowed (a la DHIS 1.4) or allowed regardless of which orgunits have actually been assigned. To manage notifications about this bug go to: https://bugs.launchpad.net/dhis2/+bug/1331983/+subscriptions -- You received this bug notification because you are a member of DHIS 2 developers, which is subscribed to DHIS. https://bugs.launchpad.net/bugs/1331983 Title: orgunit-tree-is-incorrectly-persisted-after-editing-user-V2 Status in DHIS 2: New Bug description: I've copied the bug description from bug #891005 from 2011 as I have exactly the same issue. The only way to regain access to the full orgunit tree for the admin seems to be a backup recovery. --- Hi Morten , I have tried to describe steps to reproduce this bug. I think the procedure will work, but it took me some time to figure out how to reproduce it! 1)Login as admin 2)Add a new user test_user1 3)Assing Data entry clerk 4)Assign Badija 5)Press Add 6)Add a new
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16347: add new parameter to DataElementOperands controller, persisted=true/false, allows for getting onl...
revno: 16347 committer: Morten Olav Hansen morte...@gmail.com branch nick: dhis2 timestamp: Fri 2014-08-08 15:54:26 +0700 message: add new parameter to DataElementOperands controller, persisted=true/false, allows for getting only persisted operands modified: dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/Options.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/dataelement/DataElementOperandController.java -- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/Options.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/Options.java 2014-08-07 11:46:01 + +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/Options.java 2014-08-08 08:54:26 + @@ -96,17 +96,17 @@ return null; } - + protected static boolean stringAsBoolean( String str, boolean defaultValue ) { return str != null ? Boolean.parseBoolean( str ) : defaultValue; } - + protected static boolean stringIsTrue( String str ) { return stringAsBoolean( str, false ); } - + protected static int stringAsInt( String str ) { return stringAsInt( str, 0 ); @@ -155,18 +155,18 @@ //-- /** - * Indicates whether the given object type is enabled. Takes the assumeTrue + * Indicates whether the given object type is enabled. Takes the assumeTrue * parameter into account. */ public boolean isEnabled( String type ) { String enabled = options.get( type ); -return stringIsTrue( enabled ) || ( enabled == null assumeTrue ); +return stringIsTrue( enabled ) || (enabled == null assumeTrue); } /** - * Indicates whether the given object type is disabled. Takes the assumeTrue + * Indicates whether the given object type is disabled. Takes the assumeTrue * parameter into account. */ public boolean isDisabled( String type ) @@ -178,7 +178,7 @@ { return stringAsDate( options.get( key ) ); } - + /** * Indicates whether the options contains the given parameter key. */ @@ -188,14 +188,14 @@ } /** - * Indicates whether the options contains a non-null option value for the given + * Indicates whether the options contains a non-null option value for the given * parameter key. */ public boolean containsValue( String key ) { return options.get( key ) != null; } - + /** * Returns the option value for the given parameter key. */ @@ -209,15 +209,15 @@ */ public Integer getInt( String key ) { -return options.get( key ) != null ? Integer.parseInt( options.get( key ) ) : null; +return options.containsKey( key ) ? Integer.parseInt( options.get( key ) ) : null; } - + /** * Indicates whether the option value for the parameter key is true. */ public boolean isTrue( String key ) { -return options.get( key ) != null Boolean.parseBoolean( options.get( key ) ); +return options.containsKey( key ) Boolean.parseBoolean( options.get( key ) ); } //-- === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/dataelement/DataElementOperandController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/dataelement/DataElementOperandController.java 2014-08-05 04:47:34 + +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/dataelement/DataElementOperandController.java 2014-08-08 08:54:26 + @@ -28,6 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import com.google.common.collect.Lists; import org.hisp.dhis.common.Pager; import org.hisp.dhis.common.PagerUtils; import org.hisp.dhis.dataelement.DataElement; @@ -56,16 +57,25 @@ protected ListDataElementOperand getEntityList( WebMetaData metaData, WebOptions options ) { -ListDataElement dataElements = new ArrayList( manager.getAllSorted( DataElement.class ) ); -ListDataElementOperand entityList = new ArrayList( categoryService.getFullOperands( dataElements ) ); +ListDataElementOperand dataElementOperands; + +if ( options.isTrue( persisted ) ) +{ +dataElementOperands = Lists.newArrayList( manager.getAll(
[Dhis2-devs] Data import to a Dataset linked to a combination of categories
Dear DHIS users/developers, As you know, we have a feature in DHIS that allows a dataset to be linked to a Combination of categories. In the data entry form, these category combinations will be rendered as dropdown lists in addition to the Org Unit and period. These category combinations are configured as Attributes so they could be linked to the dataset in that way. This is a very good feature and works well from the web user interface data entry forms. However, if we want to import data using xml/csv file, this doesn't work as needed. That is because the import template does not support any category combinations defined in the dataset. It only works if the dataset is configured with the default category combination. My question == is there any way that we can import data to this kind of dataset and set the values of the category combination attributes from the input file (xml/csv). Has anyone faced this issue and found a solution for it? If it is it a bug in the system, do you know if there is any plan to fix it? Awaiting your feedback please... Note that I am using the latest version of DHIS 2.15 Rev. 15181 Thanks, Maheed ___ 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 2.16 update
Hi Lars This release 2.16 is scheduled reports with customizable parameters? Regards, 2014-06-22 10:43 GMT-03:00 Lars Helge Øverland larshe...@gmail.com: Hi all, here comes a quick update and preview of version 2.16. We plan to release in the first weeks on July. The major features being included: - Event visualizer: New app for visualizations / charts of aggregated event data. Preview https://apps.dhis2.org/dev/dhis-web-event-visualizer/app/index.html - Tracker capture: New app for tracking, intended to replace the current individual records module in 2.17. For 2.16 it will support search for tracked entities and dashboard with widgets for enrollment, data capture, current selections, profile, relationships and notes (at least). Preview https://apps.dhis2.org/dev/dhis-web-tracker-capture/index.html - Web API: Improved meta-data support. The API will support meta-data field filtering, allowing the consumer to explicitly define which fields should be included on objects when retrieving meta-data. The tracker related objects like programs and events will be fully supported in the API including the possibility for creating and updating objects. Docs https://www.dhis2.org/doc/snapshot/en/user/html/ch30s07.html | Docs https://www.dhis2.org/doc/snapshot/en/user/html/ch30s08.html - Calendar: Support for an array of eight calendars including nepal, coptic, julian. Preview https://apps.dhis2.org/dev/dhis-web-maintenance-settings/systemCalendarSettings.action - Data value one-way sync: Support for automatically sending data from a semi-offline DHIS instance to another central, online DHIS instance. - Event analytics: Support for data element aggregation operators in the event analytics api and event reports app, allowing for sum, average, count, etc aggregation of events. There is a range of smaller features planned for 2.16 which you can find on Launchpad here https://launchpad.net/dhis2/+milestone/2.16. regards, Lars ___ 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 -- José Berilo Estatístico DEAVE - BEMFAM jber...@bemfam.org.br Tel. 21 30052412 ___ 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] DHIS upgrade from 2.0.5 to 2.14
Good Day Every one I want to upgrade DHIS 2.0.5 to a new version(2.14) which is more advanced with a lot of improved features. I cannot see a clear manual for doing the upgrade like scripts for all the versions from 2.0.5 to 2.14. How can I upgrade without continuously moving version by version. Thanks for your help in advanced... ___ 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] Dataset Section
Hi, My main concern at this moment is on implementing name-based datasets in DHIS2. I have been through a real hectic process to come up with a Minimum clinical dataset for cancer screening In my view, practically it is better for our generic software to accommodate needed functions rather than redesigning the form form the point where it is declared essential by the progremme officialsAnd I think the aggregate side forms and patient side forms are functionally different. For example, branching logic is quite handy in name-based forms. Lars: Thanks for the docs.I will try it out and comeback to you if needed. And I like your idea on section forms. Neranga On 23 July 2014 12:06, Lars Helge Øverland larshe...@gmail.com wrote: Hi there, thanks for the input. I don't think we will implement custom forms in section forms in the near future. When you have a form which is super-wide with mostly unused fields then that's usually a sign that the form itself should be re-designed. I have been thinking of a function for using the section form HTML as basis for custom forms - ie. you could get the section form layout as a starting point and then go on to modify the parts you need. Neranga: If you need tabs also for custom forms we have jquery ui included in the page and its pretty simple to set up the tabs widget with a little bit of HTML/javascript, see docs here http://api.jqueryui.com/tabs/. best regards, Lars On Wed, Jul 23, 2014 at 7:02 AM, Neranga neranga.liyanaarach...@gmail.com wrote: Hi, I faced a similar issue when I was customizing DHIS2 tracked instance to collect patient-based data for the cancer screening clinic in Sri Lanka. (DHIS2.15) In our case, client details are collected for registration and then for the visit clinical history, examination, investigations and follow up details are recorded. As you understand there are elements which are very specific to females and males, however it was difficult to implement the hiding fields according to the value given to the sex attribute. I couldn't find a way to implement that logic. Instead we designed 2 separate programs for males and females, and it was not too bad to do so. On the other hand I also found the sections in the program stages quite useful too. But I had to give up the custom designed forms and go ahead with the auto generated forms, because when I designed the form, the section tab was no longer available. I think these experiences will help developers to make future changes. Thanks. *L.A. Neranga Prabhath* *Trainee - MSc in Medical Informatics* *Postgraduate Institute of Medicine* *University of Colombo-Sri Lanka.* *Telephone: +94772531559 %2B94772531559* On 23 July 2014 10:12, Knut Staring knu...@gmail.com wrote: Related to this, we have a big form where most sections are very simple and broken down only by gender, but one is also broken down by A LOT of age groupings, so the auto-generated form becomes extremely wide and the users have to scroll a lot horizontally. This also means it is very easy for them to lose track of where they are, though of course they do have the little box in the upper right corner which is meant to help with exactly those cases. So, in general we are very happy with the autogenerated form (and it is huge, with 10 sections), but would like to be able to customize the layout for this particular section (actually, the IDEAL option would be to be able to specify the width of the cells - as we could well have cells only a third of the automatic width). I suppose the best solution for now is to separate out this particular section into a separate form, but are we planning to support custom forms for sections? Knut On Wed, Jul 23, 2014 at 6:23 AM, rin.chann...@gmail.com wrote: Hi all developers, *MY SUGGESTION:* In “section grey field management” of combo category options. Has only “Disable field” for disable entry value. But I think it is important, we should have “Hide field” to hide some combo category. Because it effect on showing in Data Entry, if we has many combo category option cross with data element. thank you CHANNARA ___ 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 -- Knut Staring Dept. of Informatics, University of Oslo +4791880522 http://dhis2.org ___ 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-users Post to : dhis2-us...@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-users More
[Dhis2-devs] upgrade from 2.0.5 to 2.14
Good Day Every one I want to upgrade DHIS 2.0.5 to a new version(2.14) which is more advanced with a lot of improved features. I cannot see a clear manual for doing the upgrade like scripts for all the versions from 2.0.5 to 2.14. How can I upgrade without continously moving version by version. Thanks for your help in advanced... Moemedi Ntunyane Co-founder KeyInConsulting ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs] [Dhis2-users] Dataset Section
Hi, I faced a similar issue when I was customizing DHIS2 tracked instance to collect patient-based data for the cancer screening clinic in Sri Lanka. (DHIS2.15) In our case, client details are collected for registration and then for the visit clinical history, examination, investigations and follow up details are recorded. As you understand there are elements which are very specific to females and males, however it was difficult to implement the hiding fields according to the value given to the sex attribute. I couldn't find a way to implement that logic. Instead we designed 2 separate programs for males and females, and it was not too bad to do so. On the other hand I also found the sections in the program stages quite useful too. But I had to give up the custom designed forms and go ahead with the auto generated forms, because when I designed the form, the section tab was no longer available. I think these experiences will help developers to make future changes. Thanks. *L.A. Neranga Prabhath* *Trainee - MSc in Medical Informatics* *Postgraduate Institute of Medicine* *University of Colombo-Sri Lanka.* *Telephone: +94772531559* On 23 July 2014 10:12, Knut Staring knu...@gmail.com wrote: Related to this, we have a big form where most sections are very simple and broken down only by gender, but one is also broken down by A LOT of age groupings, so the auto-generated form becomes extremely wide and the users have to scroll a lot horizontally. This also means it is very easy for them to lose track of where they are, though of course they do have the little box in the upper right corner which is meant to help with exactly those cases. So, in general we are very happy with the autogenerated form (and it is huge, with 10 sections), but would like to be able to customize the layout for this particular section (actually, the IDEAL option would be to be able to specify the width of the cells - as we could well have cells only a third of the automatic width). I suppose the best solution for now is to separate out this particular section into a separate form, but are we planning to support custom forms for sections? Knut On Wed, Jul 23, 2014 at 6:23 AM, rin.chann...@gmail.com wrote: Hi all developers, *MY SUGGESTION:* In “section grey field management” of combo category options. Has only “Disable field” for disable entry value. But I think it is important, we should have “Hide field” to hide some combo category. Because it effect on showing in Data Entry, if we has many combo category option cross with data element. thank you CHANNARA ___ 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 -- Knut Staring Dept. of Informatics, University of Oslo +4791880522 http://dhis2.org ___ 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] Dataset Section
Hi Knut, For customizing the forms, I move all the source code to a html wysiwyg editor, such as frontpage. This gives me the ability to identify the form elements and give them the layout I want. For the cell width, I add a _style_ attribute in the input tag. This is one example: input *style=width:4em;text-align:center* id=TCTY9boIn41-j5CfAgw1uth-val title=TCTY9boIn41 -xxx value=xxx / You can adapt the size with the width attribute (here 4em, but could be more or even less, depending on how you want to manage the inputs) Best regards Kader 2014-07-24 19:47 GMT+03:00 Knut Staring knu...@gmail.com: Hm...I thought custom forms would do the trick, but unfortunately the very act of binding each cell in the table to a dataelement/categoryoptioncombe makes in the online editor makes the cells far too wide (see the attached form). Would be greateful for tips on how to keep the cells the same width as they are in the right hand columns. On Wed, Jul 23, 2014 at 6:42 AM, Knut Staring knu...@gmail.com wrote: Related to this, we have a big form where most sections are very simple and broken down only by gender, but one is also broken down by A LOT of age groupings, so the auto-generated form becomes extremely wide and the users have to scroll a lot horizontally. This also means it is very easy for them to lose track of where they are, though of course they do have the little box in the upper right corner which is meant to help with exactly those cases. So, in general we are very happy with the autogenerated form (and it is huge, with 10 sections), but would like to be able to customize the layout for this particular section (actually, the IDEAL option would be to be able to specify the width of the cells - as we could well have cells only a third of the automatic width). I suppose the best solution for now is to separate out this particular section into a separate form, but are we planning to support custom forms for sections? Knut On Wed, Jul 23, 2014 at 6:23 AM, rin.chann...@gmail.com wrote: Hi all developers, *MY SUGGESTION:* In “section grey field management” of combo category options. Has only “Disable field” for disable entry value. But I think it is important, we should have “Hide field” to hide some combo category. Because it effect on showing in Data Entry, if we has many combo category option cross with data element. thank you CHANNARA ___ 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 -- Knut Staring Dept. of Informatics, University of Oslo +4791880522 http://dhis2.org -- Knut Staring Dept. of Informatics, University of Oslo +4791880522 http://dhis2.org ___ 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] Category Options not getting translated from dhis.
Hi all , We are still facing this issue , did anyone have a chance to look at it ? On Wed, Jun 18, 2014 at 11:52 AM, Mansi Singhal msing...@thoughtworks.com wrote: Hello all, We were trying to translate Category Option from dhis. It is failing. *Error:* Sorry! The system failed to execute the operation. Usually, no data is lost and you can continue working by going back to the previous page. When we tried looking into it, we figured out that categoryOption mapping is not there in identifiableObjectStores property of DefaultIdentifiableObjectManager class. It seems that some implementation for that object store is missing Can you please look into this issue? This problem is occurring for Category as well as Category Group translation. -- Regards, Mansi Singhal -- *Sandesh Doolipeta**Application Developer* emailsande...@thoughtworks.com Telephone9686062727 [image: ThoughtWorks] http://www.thoughtworks.com/ ___ 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 version 2.16 released
Whoa. Awesome. Thanks for the amazing work you guys do. Can't wait to put it through the ringer! Nicola On Fri, Jul 25, 2014 at 12:01 PM, Lars Helge Øverland larshe...@gmail.com wrote: Hi all, DHIS version 2.16 is out and we have some great new features: *- Tracker capture app:* We have a completely new app for tracking persons and other entities. This app lets you register and search persons. It features a dashboard which gives you the complete overview of the person. It is customizable and designed around widgets, making it easy to place the information you need where you need it. It currently features widgets for enrollment, profile, data capture through stages, summary report, relationships, notes and current selections. This app will eventually replace the individual records module. Check it out by selecting org units at the lowest level in the hierarchy and the TB program on the demo. Demo Search https://apps.dhis2.org/demo/dhis-web-tracker-capture/index.html#/ | Demo Dashboard https://apps.dhis2.org/demo/dhis-web-tracker-capture/index.html#/dashboard?tei=J8KD01PshMCprogram=ur1Edk5Oe2n | Docs https://www.dhis2.org/doc/snapshot/en/user/html/ch29.html *- Event visualizer app:* A new app for creating charts based on events. Works similarly to event reports. It lets you create aggregated event data visualizations based on flexible queries on attributes and data elements. It lets you analyze events based on time periods, organisation units and group sets, and place any dimension as chart series, category and filters. It supports a range of options for controlling the range and domain axis, target and base lines, labels and chart title. You can save your charts as favorites and share them with others. Charts can be downloaded as PNG images and PDF documents. Check out the favorites on the demo. Demo https://apps.dhis2.org/demo/dhis-web-event-visualizer/app/index.html?id=WIxuUpm5m4U | Docs https://www.dhis2.org/doc/snapshot/en/user/html/ch28.html *- Event charts in dashboard:* The charts created in event visualizer can easily be included in the dashboard, as a separate dashboard or together with aggregate analysis. Simply search from the dashboard search field and look under event charts, then click add next to each chart. Click on Inpatient Morbidity Mortality dashboard on demo. Demo https://apps.dhis2.org/demo/dhis-web-dashboard-integration/index.action *- Org unit group sets in event analysis:* The event reports and visualizer apps now enables analysis of organisation unit group set based dimensions. This means that you can easily create analysis of events across e.g. facility types and ownership without going through aggregation queries. Demo https://apps.dhis2.org/demo/dhis-web-event-visualizer/app/index.html?id=aH8nJjd4whM *- Multiple calendars for data capture:* The system now supports a range of calendars for data capture, including Ethiopian, Gregorian, Islamic, ISO 8601, Julian, Nepali, Thai. You can set which calendar to use under Settings Calendar. Demo https://apps.dhis2.org/demo/dhis-web-maintenance-settings/systemCalendarSettings.action *- Data synchronization:* You can synchronize data collected in a local instance of DHIS 2 with another, remote instance of DHIS 2. This is useful e.g. in a scenario where you have multiple DHIS 2 instances deployed partly offline in the field and want them to automatically submit data to a central, online instance of DHIS 2. To enable sync first go Settings Synchronization and enter the URL, username and password of the remote server. Second, go to Data administration Data synchronization and set strategy to enabled. The system will attempt a synchronization request every minute. Demo https://apps.dhis2.org/demo/dhis-web-maintenance-settings/systemSynchronizationSettings.action | Docs https://www.dhis2.org/doc/snapshot/en/user/html/ch22s17.html *- Data value audit trail:* Audit trail, i.e. the history of modifications happened to a data value, is now supported. This is useful in order to keep track of changes and manage changes in cases where multiple people are working on the same data. Check it out in data entry by editing a field a few times, clicking in the input cell to open the history dialog and click on Audit trail. Demo https://apps.dhis2.org/demo/dhis-web-dataentry/index.action | Screenshot http://folk.uio.no/larshelg/images/audit-trail.png *- Totals in validation rules:* You can now insert data element category option totals directly in validation rules. This should make the validation rule expression less verbose and more manageable. Click on edit left side on the demo. Demo https://apps.dhis2.org/demo/dhis-web-validationrule/showAddValidationRuleForm.action *- Top menu search:* The top menu now has a search field which you can use to more quickly find the apps you are searching for. Hover the apps link on the demo. Demo
Re: [Dhis2-devs] [Dhis2-users] Dataset Section
Hi Lars, This is a great feature indeed. Just in case it would be considered not obvious to implement, would it be possible to fill automatically a template for the custom forms with style configuration infos provided in a configuration form? This meets Knut's last suggestion and simplifies the design process for most users. Best regards, Kader Le 24 juil. 2014 22:50, Lars Helge Øverland larshe...@gmail.com a écrit : Wrong link due to cache, this is it: https://www.dhis2.org/doc/snapshot/en/user/html/ch32s38.html ___ 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 version 2.16 released
Great job... so cool features has added. Development on tracker, webAPI, and visualizer are fantastic Congratulation and many many thanks to dTeam On 25 Jul 2014 22:01, Lars Helge Øverland larshe...@gmail.com wrote: Hi all, DHIS version 2.16 is out and we have some great new features: *- Tracker capture app:* We have a completely new app for tracking persons and other entities. This app lets you register and search persons. It features a dashboard which gives you the complete overview of the person. It is customizable and designed around widgets, making it easy to place the information you need where you need it. It currently features widgets for enrollment, profile, data capture through stages, summary report, relationships, notes and current selections. This app will eventually replace the individual records module. Check it out by selecting org units at the lowest level in the hierarchy and the TB program on the demo. Demo Search https://apps.dhis2.org/demo/dhis-web-tracker-capture/index.html#/ | Demo Dashboard https://apps.dhis2.org/demo/dhis-web-tracker-capture/index.html#/dashboard?tei=J8KD01PshMCprogram=ur1Edk5Oe2n | Docs https://www.dhis2.org/doc/snapshot/en/user/html/ch29.html *- Event visualizer app:* A new app for creating charts based on events. Works similarly to event reports. It lets you create aggregated event data visualizations based on flexible queries on attributes and data elements. It lets you analyze events based on time periods, organisation units and group sets, and place any dimension as chart series, category and filters. It supports a range of options for controlling the range and domain axis, target and base lines, labels and chart title. You can save your charts as favorites and share them with others. Charts can be downloaded as PNG images and PDF documents. Check out the favorites on the demo. Demo https://apps.dhis2.org/demo/dhis-web-event-visualizer/app/index.html?id=WIxuUpm5m4U | Docs https://www.dhis2.org/doc/snapshot/en/user/html/ch28.html *- Event charts in dashboard:* The charts created in event visualizer can easily be included in the dashboard, as a separate dashboard or together with aggregate analysis. Simply search from the dashboard search field and look under event charts, then click add next to each chart. Click on Inpatient Morbidity Mortality dashboard on demo. Demo https://apps.dhis2.org/demo/dhis-web-dashboard-integration/index.action *- Org unit group sets in event analysis:* The event reports and visualizer apps now enables analysis of organisation unit group set based dimensions. This means that you can easily create analysis of events across e.g. facility types and ownership without going through aggregation queries. Demo https://apps.dhis2.org/demo/dhis-web-event-visualizer/app/index.html?id=aH8nJjd4whM *- Multiple calendars for data capture:* The system now supports a range of calendars for data capture, including Ethiopian, Gregorian, Islamic, ISO 8601, Julian, Nepali, Thai. You can set which calendar to use under Settings Calendar. Demo https://apps.dhis2.org/demo/dhis-web-maintenance-settings/systemCalendarSettings.action *- Data synchronization:* You can synchronize data collected in a local instance of DHIS 2 with another, remote instance of DHIS 2. This is useful e.g. in a scenario where you have multiple DHIS 2 instances deployed partly offline in the field and want them to automatically submit data to a central, online instance of DHIS 2. To enable sync first go Settings Synchronization and enter the URL, username and password of the remote server. Second, go to Data administration Data synchronization and set strategy to enabled. The system will attempt a synchronization request every minute. Demo https://apps.dhis2.org/demo/dhis-web-maintenance-settings/systemSynchronizationSettings.action | Docs https://www.dhis2.org/doc/snapshot/en/user/html/ch22s17.html *- Data value audit trail:* Audit trail, i.e. the history of modifications happened to a data value, is now supported. This is useful in order to keep track of changes and manage changes in cases where multiple people are working on the same data. Check it out in data entry by editing a field a few times, clicking in the input cell to open the history dialog and click on Audit trail. Demo https://apps.dhis2.org/demo/dhis-web-dataentry/index.action | Screenshot http://folk.uio.no/larshelg/images/audit-trail.png *- Totals in validation rules:* You can now insert data element category option totals directly in validation rules. This should make the validation rule expression less verbose and more manageable. Click on edit left side on the demo. Demo https://apps.dhis2.org/demo/dhis-web-validationrule/showAddValidationRuleForm.action *- Top menu search:* The top menu now has a search field which you can use to more quickly find the apps you are searching for. Hover the apps
Re: [Dhis2-devs] [Dhis2-users] Dhis2 Demo Login Credentials
Knut, I have tried the login credentials but they are not working. Please advice. Regards *Stanley Kalyati | Monitoring and Evaluation Technical Lead* *PSI/Malawi* Head Office Main Warehouse,Off M1 Road,Kanengo,Area 28 Plot 198 PO Box 30132, Capital City, Lilongwe 3 Malawi Tel: +265 (0) 1 711 484 | Fax: +265 (0) 1 711 486| Cell: 0992 313 978/0993 855 635 skaly...@psimalawi.org kmalew...@psimalawi.org%C2%A0| www.psi.org/malawi Skype: stanley.kalyati1 | Gmail: skaly...@gmail.com On 1 August 2014 15:02, Knut Staring knu...@gmail.com wrote: Hello, You can now log in as admin with password District1 (from midnight it should be back to just district) Knut On Fri, Aug 1, 2014 at 2:47 PM, benjamin dubdabasoduba mwalimu dubdabasod...@gmail.com wrote: Hi guys! The admin/ district login credentials arent working for the demo site can anyone please have a look on that. Regards, Benjamin Mwalimu ___ 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-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] Dataset Section
I agree with you. In fact, I think it would be nice to complete the ability to create custom forms, by giving the possibility to edit its css styles in a separate file. This way, we could have a more complete control on the look-and-feel of the forms. Adding cellspadding style in the td tags (td style=cellpadding:0px ...) didn't work for me, and I did not look more forward to solve this problem, guessing that the problem came from the management of the style sheets. Do you think developers can have a look at it more closely? It could be nice to give this ability in order to complete the creation of customized forms. 2014-07-24 20:19 GMT+03:00 Knut Staring knu...@gmail.com: Thanks Kader, I was thinking there would be a more elegant method than to insert a style for each of the 24x20 cells, but your suggestion works well with a simple search/replace of input in Notepad++ (no need for an HTML editor). I would also love to get rid of the excessive padding to the left and right of the input field in the cell. And of course it would be nice to not have to manually insert the 240 data bindings, so would very much welcome the realization of Lars' thoughts on making the auto-generated form available as a starting point for the customization. On Thu, Jul 24, 2014 at 7:01 PM, Kader Irchad Barry kaderb...@gmail.com wrote: Hi Knut, For customizing the forms, I move all the source code to a html wysiwyg editor, such as frontpage. This gives me the ability to identify the form elements and give them the layout I want. For the cell width, I add a _style_ attribute in the input tag. This is one example: input *style=width:4em;text-align:center* id=TCTY9boIn41-j5CfAgw1uth-val title=TCTY9boIn41 -xxx value=xxx / You can adapt the size with the width attribute (here 4em, but could be more or even less, depending on how you want to manage the inputs) Best regards Kader 2014-07-24 19:47 GMT+03:00 Knut Staring knu...@gmail.com: Hm...I thought custom forms would do the trick, but unfortunately the very act of binding each cell in the table to a dataelement/categoryoptioncombe makes in the online editor makes the cells far too wide (see the attached form). Would be greateful for tips on how to keep the cells the same width as they are in the right hand columns. On Wed, Jul 23, 2014 at 6:42 AM, Knut Staring knu...@gmail.com wrote: Related to this, we have a big form where most sections are very simple and broken down only by gender, but one is also broken down by A LOT of age groupings, so the auto-generated form becomes extremely wide and the users have to scroll a lot horizontally. This also means it is very easy for them to lose track of where they are, though of course they do have the little box in the upper right corner which is meant to help with exactly those cases. So, in general we are very happy with the autogenerated form (and it is huge, with 10 sections), but would like to be able to customize the layout for this particular section (actually, the IDEAL option would be to be able to specify the width of the cells - as we could well have cells only a third of the automatic width). I suppose the best solution for now is to separate out this particular section into a separate form, but are we planning to support custom forms for sections? Knut On Wed, Jul 23, 2014 at 6:23 AM, rin.chann...@gmail.com wrote: Hi all developers, *MY SUGGESTION:* In “section grey field management” of combo category options. Has only “Disable field” for disable entry value. But I think it is important, we should have “Hide field” to hide some combo category. Because it effect on showing in Data Entry, if we has many combo category option cross with data element. thank you CHANNARA ___ 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 -- Knut Staring Dept. of Informatics, University of Oslo +4791880522 http://dhis2.org -- Knut Staring Dept. of Informatics, University of Oslo +4791880522 http://dhis2.org ___ 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 -- 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
Re: [Dhis2-devs] [Dhis2-users] DHIS version 2.16 released
Dear All, This is really useful information summaries all feature of new version of DHIS2, I will share this with my team and update them about this. Thank again’ Kind regards, Dr. Chansaly From: Dhis2-users [mailto:dhis2-users-bounces+hsipchansaly=etllao@lists.launchpad.net] On Behalf Of Lars Helge Øverland Sent: Friday, July 25, 2014 11:01 PM To: DHIS 2 Developers list; DHIS 2 Users list; Vincent Shaw; Calle Hedberg; Ayub Manya; Martin Osumba; Schaefer, Petra; Paul Bouey; Gehron, Michael M; Tyler R Smith; Jorge Queipo; Bale, Jeffrey M. (CDC/CGH/DGHA) (CTR); Denis Adaletey; Austen Peter Davis; Lene Jeanette Lothe; Egwuma Efo; Lakshmi Balachandran; Gaurav Bhattacharya; Kiran Prakash; Megan McGuire; Carme BARALDES; Carl Leitner; Jaco Venter; Chris Seebregts; Chris Moyo; sundeep; Jørn Braa; Pascal Brandt; Carl Fourie; Amuha, Monica; Linda Fogarty; Ellen Brazier; Paul Amendola; ernest.os...@rescue.org; Benjamin Winters Subject: [Dhis2-users] DHIS version 2.16 released Hi all, DHIS version 2.16 is out and we have some great new features: - Tracker capture app: We have a completely new app for tracking persons and other entities. This app lets you register and search persons. It features a dashboard which gives you the complete overview of the person. It is customizable and designed around widgets, making it easy to place the information you need where you need it. It currently features widgets for enrollment, profile, data capture through stages, summary report, relationships, notes and current selections. This app will eventually replace the individual records module. Check it out by selecting org units at the lowest level in the hierarchy and the TB program on the demo. Demo Search https://apps.dhis2.org/demo/dhis-web-tracker-capture/index.html#/ | Demo Dashboard https://apps.dhis2.org/demo/dhis-web-tracker-capture/index.html#/dashboard?tei=J8KD01PshMCprogram=ur1Edk5Oe2n | Docs https://www.dhis2.org/doc/snapshot/en/user/html/ch29.html - Event visualizer app: A new app for creating charts based on events. Works similarly to event reports. It lets you create aggregated event data visualizations based on flexible queries on attributes and data elements. It lets you analyze events based on time periods, organisation units and group sets, and place any dimension as chart series, category and filters. It supports a range of options for controlling the range and domain axis, target and base lines, labels and chart title. You can save your charts as favorites and share them with others. Charts can be downloaded as PNG images and PDF documents. Check out the favorites on the demo. Demo https://apps.dhis2.org/demo/dhis-web-event-visualizer/app/index.html?id=WIxuUpm5m4U | Docs https://www.dhis2.org/doc/snapshot/en/user/html/ch28.html - Event charts in dashboard: The charts created in event visualizer can easily be included in the dashboard, as a separate dashboard or together with aggregate analysis. Simply search from the dashboard search field and look under event charts, then click add next to each chart. Click on Inpatient Morbidity Mortality dashboard on demo. Demo https://apps.dhis2.org/demo/dhis-web-dashboard-integration/index.action - Org unit group sets in event analysis: The event reports and visualizer apps now enables analysis of organisation unit group set based dimensions. This means that you can easily create analysis of events across e.g. facility types and ownership without going through aggregation queries. Demo https://apps.dhis2.org/demo/dhis-web-event-visualizer/app/index.html?id=aH8nJjd4whM - Multiple calendars for data capture: The system now supports a range of calendars for data capture, including Ethiopian, Gregorian, Islamic, ISO 8601, Julian, Nepali, Thai. You can set which calendar to use under Settings Calendar. Demo https://apps.dhis2.org/demo/dhis-web-maintenance-settings/systemCalendarSettings.action - Data synchronization: You can synchronize data collected in a local instance of DHIS 2 with another, remote instance of DHIS 2. This is useful e.g. in a scenario where you have multiple DHIS 2 instances deployed partly offline in the field and want them to automatically submit data to a central, online instance of DHIS 2. To enable sync first go Settings Synchronization and enter the URL, username and password of the remote server. Second, go to Data administration Data synchronization and set strategy to enabled. The system will attempt a synchronization request every minute. Demo https://apps.dhis2.org/demo/dhis-web-maintenance-settings/systemSynchronizationSettings.action | Docs https://www.dhis2.org/doc/snapshot/en/user/html/ch22s17.html - Data value audit trail: Audit trail, i.e. the history of modifications happened to a data value, is now supported. This is useful in order to keep track of changes and manage changes
[Dhis2-devs] Poor output after upload Ghana gml file for 216 districts shape files
Hello, I have optimised Ghana current 216 districts shape files to 80%, match all organisational units from gml with that of Ghana DHIMS and changes all ‘DISTRICT’ in gml to Name. But the output after importing is not good. what did I missed Need urgent help Regards Paapa Larbi-Debrah P.K Policy Planning Monitoring and Evaluation Ghana Health Service Post Office Box GP 2848 Accra. Skypepaapalarbi Twitterpaapa.larbi Office [+233-30-266-8152] Cell 1 [+233-20-907-4136] Cell 2 [+233-24-499-0130] ___ 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 version 2.16 released
Congratulations Lars and to the development team. Glad to see these new features enrich the application. What is the process for suggesting new features? Best regards, Kader Le 25 juil. 2014 19:25, Marta Vila martav...@gmail.com a écrit : Great features! ;) congratulations to the whole dev team, have a good weekend!!! On 25 July 2014 18:05, Muhammad Salihu mailfriend5...@gmail.com wrote: Great work Lars!!! Kudos to you and the team. We will test and give feedback. Regards, Muhammad Salihu -- Sent from my mobile -Original Message- From: Lars Helge Øverland larshe...@gmail.com Sender: Dhis2-users dhis2-users-bounces+mailfriend5000=gmail@lists.launchpad.netDate: Fri, 25 Jul 2014 18:01:10 To: DHIS 2 Developers listdhis2-devs@lists.launchpad.net; DHIS 2 Users listdhis2-us...@lists.launchpad.net; Vincent Shawvps...@gmail.com; Calle Hedbergcalle.hedb...@gmail.com; Ayub Manyaayubma...@gmail.com; Martin Osumbamartin_osu...@afyainfo.org; Schaefer, Petra pschae...@sure.ug; Paul Boueyboue...@state.gov; Gehron, Michael M gehro...@state.gov; Tyler R Smithsmit...@state.gov; Jorge Queipo jque...@usa-ctc.com; Bale, Jeffrey M. (CDC/CGH/DGHA) (CTR)w...@cdc.gov; Denis Adaleteydadale...@yahoo.com; Austen Peter Davis austen.da...@norad.no; Lene Jeanette Lothelene.jeanette.lo...@norad.no; Egwuma Efoe...@clintonhealthaccess.org; Lakshmi Balachandran lbalachand...@clintonhealthaccess.org; Gaurav Bhattacharya gbhattacha...@clintonhealthaccess.org; Kiran Prakash kprak...@thoughtworks.com; Megan McGuiremegan.mcgu...@newyork.msf.org; Carme BARALDEScarme.baral...@barcelona.msf.org; Carl Leitner cleit...@capacityplus.org; Jaco Venterj...@hisp.org; Chris Seebregts ch...@jembi.org; Chris Moyomoyoch...@gmail.com; sundeep sundeep.sa...@gmail.com; Jørn Braajornb...@gmail.com; Pascal Brandt pas...@jembi.org; Carl Fouriec...@jembi.org; Amuha, Monica mam...@msh.org; Linda Fogartylinda.foga...@jhpiego.org; Ellen Brazier ebraz...@engenderhealth.org; Paul Amendolapaul.amend...@rescue.org; ernest.os...@rescue.org; Benjamin Wintersbwint...@akros.com Subject: [Dhis2-users] DHIS version 2.16 released ___ 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-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-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] Problem with resetting password on 2.15
To be even more explicit, you could try also running the following SQL query: update users set passwordlastupdated = '2014-08-08' On 8/8/14, Morten Olav Hansen morte...@gmail.com wrote: Hi Elmarie, Did you try this again? did you manage to get it working? We have had reports of this happening one time before, but I could never reproduce it here locally.. Could you tell me more about your setup? exact dhis version, browser, did you clear the cache etc. Did the column users.passwordlastupdated get updated? If this happens, and locks people out, probably the simplest solution is to simple set passwordlastupdated to todays date (but please try on test server). -- Morten On Wed, Aug 6, 2014 at 4:16 PM, Elmarie Claasen elma...@hisp.org wrote: Thanks Knut we will try this. Regards, *Elmarie Claasen* [image: Hisp logo] Project Manager Health Information Systems Programme Tel: 041-367 1027 Cell: 082 374 2209 E-mail: elma...@hisp.org Skype: elmarie.claasen52 *From:* Knut Staring [mailto:knu...@gmail.com] *Sent:* 06 August 2014 10:41 AM *To:* Elmarie Claasen *Cc:* DHIS 2 developers *Subject:* Re: [Dhis2-devs] Problem with resetting password on 2.15 Hi Elmarie, This is just a partial solution, but hopefully will restore your access to the system. Assuming you have direct access to the database (on the command line or through PgAdmin), you can run the following: update users set password = '48e8f1207baef1ef7fe478a57d19f2e5' where username = 'admin' This should enable you to log in with the default admin/district. But of course you should then proceed to change this password. Knut On Wed, Aug 6, 2014 at 10:28 AM, Elmarie Claasen elma...@hisp.org wrote: Hi all, We have a problem with a database in which we activated the option that passwords must be reset every x months. Suddenly all of the Superusers are getting a message to reset the password which you follow and ‘save’ but saving does not log you into the database. When you go back to the login screen try to log in with the new password it says incorrect password because it evidently did not save the password. When you use the old password you simply get the same message to change your password. The database is on 2.15. We are now effectively logged out of the database – please help! Regards, *Elmarie Claasen* [image: Hisp logo] Project Manager Health Information Systems Programme Tel: 041-367 1027 Cell: 082 374 2209 E-mail: elma...@hisp.org Skype: elmarie.claasen52 ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp -- Knut Staring Dept. of Informatics, University of Oslo +4791880522 http://dhis2.org ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp -- Knut Staring Dept. of Informatics, University of Oslo +4791880522 http://dhis2.org ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs] Poor output after upload Ghana gml file for 216 districts shape files
Please be more explicit: the output after importing is not good is not very informative. In what way is it not good?? Screenshots? Knut On 8/1/14, Paapa Larbi-Debrah P paapala...@gmail.com wrote: Hello, I have optimised Ghana current 216 districts shape files to 80%, match all organisational units from gml with that of Ghana DHIMS and changes all ‘DISTRICT’ in gml to Name. But the output after importing is not good. what did I missed Need urgent help Regards Paapa Larbi-Debrah P.K Policy Planning Monitoring and Evaluation Ghana Health Service Post Office Box GP 2848 Accra. Skypepaapalarbi Twitterpaapa.larbi Office [+233-30-266-8152] Cell 1 [+233-20-907-4136] Cell 2 [+233-24-499-0130] -- 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 16348: Email settings, encrypting smtp password
revno: 16348 committer: Lars Helge Overland larshe...@gmail.com branch nick: dhis2 timestamp: Fri 2014-08-08 11:41:58 +0200 message: Email settings, encrypting smtp password modified: dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/Configuration.java 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/message/EmailMessageSender.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/setting/DefaultSystemSettingManager.java dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/configuration/hibernate/Configuration.hbm.xml dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetSMTPSettingsAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetSMTPSettingsAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/META-INF/dhis/beans.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-api/src/main/java/org/hisp/dhis/configuration/Configuration.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/Configuration.java 2014-07-07 06:44:19 + +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/Configuration.java 2014-08-08 09:41:58 + @@ -82,6 +82,12 @@ private String remoteServerPassword; // - +// SMTP +// - + +private String smtpPassword; + +// - // Constructor // - @@ -219,4 +225,17 @@ { this.remoteServerPassword = remoteServerPassword; } + +/** + * Do not serialize. + */ +public String getSmtpPassword() +{ +return smtpPassword; +} + +public void setSmtpPassword( String smtpPassword ) +{ +this.smtpPassword = smtpPassword; +} } === 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 2014-08-05 10:57:11 + +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java 2014-08-08 09:41:58 + @@ -150,8 +150,6 @@ String getEmailUsername(); -String getEmailPassword(); - boolean getEmailTls(); String getEmailSender(); === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/EmailMessageSender.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/EmailMessageSender.java 2014-08-05 14:21:42 + +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/EmailMessageSender.java 2014-08-08 09:41:58 + @@ -39,6 +39,7 @@ import org.apache.commons.mail.Email; import org.apache.commons.mail.EmailException; import org.apache.commons.mail.SimpleEmail; +import org.hisp.dhis.configuration.ConfigurationService; import org.hisp.dhis.setting.SystemSettingManager; import org.hisp.dhis.system.util.DebugUtils; import org.hisp.dhis.user.User; @@ -70,6 +71,13 @@ this.systemSettingManager = systemSettingManager; } +private ConfigurationService configurationService; + +public void setConfigurationService( ConfigurationService configurationService ) +{ +this.configurationService = configurationService; +} + private UserService userService; public void setUserService( UserService userService ) @@ -91,7 +99,7 @@ String hostName = systemSettingManager.getEmailHostName(); int port = systemSettingManager.getEmailPort(); String username = systemSettingManager.getEmailUsername(); -String password = systemSettingManager.getEmailPassword(); +String password = configurationService.getConfiguration().getSmtpPassword(); boolean tls = systemSettingManager.getEmailTls(); String from = systemSettingManager.getEmailSender(); @@ -108,6 +116,7 @@ try { +System.out.println(pw + password); Email email = getEmail( hostName, port, username, password, tls, from ); email.setSubject( SUBJECT_PREFIX + subject ); email.setMsg( text ); @@ -124,7 +133,7
Re: [Dhis2-devs] upgrade from 2.0.5 to 2.14
Hi Moemedi, You can upgrade from 2.0 to 2.10 directly. However, it is probably safer to then upgrade stepwise from 2.10 to 2.14. Best. Busoye On 8 Jul 2014, at 11:06, Moemedi Ntunyane moemedi.ntuny...@hotmail.com wrote: Good Day Every one I want to upgrade DHIS 2.0.5 to a new version(2.14) which is more advanced with a lot of improved features. I cannot see a clear manual for doing the upgrade like scripts for all the versions from 2.0.5 to 2.14. How can I upgrade without continously moving version by version. Thanks for your help in advanced... Moemedi Ntunyane Co-founder KeyInConsulting ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] (no subject)
Hello Devs, When i am trying to build DHIS2 version 14, I am facing some issues as described, [INFO] No Transaction manager found - if your webapp requires one, please configure one. [INFO] Initializing Spring root WebApplicationContext * WARN 2014-08-08 14:54:05,316 Configuration problem: Overriding globally registered AuthenticationManager Offending resource: URL [jar:file:/C:/Users/Brajesh/.m2/repository/org/hisp/dhis/dhis-web-commons/2.14/dhis-web-commons-2.14.jar!/META-INF/dhis/security.xml] (FailFastProblemReporter.java [main]) * ERROR 2014-08-08 14:54:05,576 Context initialization failed (ContextLoader.java [main]) org.springframework.beans.factory.parsing.BeanDefinitionParsingException: Configuration problem: Only one AsyncAnnotationBeanPostProcessor may exist within the context. Offending resource: URL [jar:file:/C:/Users/Brajesh/.m2/repository/org/hisp/dhis/dhis-support-external/2.14/dhis-support-external-2.14.jar!/META-INF/dhis/beans.xml] at org.springframework.beans.factory.parsing.FailFastProblemReporter.error(FailFastProblemReporter.java:68) at org.springframework.beans.factory.parsing.ReaderContext.error(ReaderContext.java:85) at org.springframework.beans.factory.parsing.ReaderContext.error(ReaderContext.java:72) at org.springframework.scheduling.config.AnnotationDrivenBeanDefinitionParser.parse(AnnotationDrivenBeanDefinitionParser.java:90) Can i expect what's going wrong with dhis-web-commons-2.14.jar ! since few days before this was working as expected. -- Regards Brajesh Murari Phone: (+91)-96-43-208375(O) (+91)-99-53-787977(P) P please consider the environment before printing this email ___ 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 16349: minor
revno: 16349 committer: Abyot Asalefew Gizaw aby...@gmail.com branch nick: dhis2 timestamp: Fri 2014-08-08 12:25:32 +0200 message: minor modified: dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java -- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2014-08-04 14:27:32 + +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2014-08-08 10:25:32 + @@ -1164,7 +1164,7 @@ private void updateOptions() { -String sql = insert into optionvalue(optionid, code, name, optionsetid, sort_order) +String sql = insert into optionvalue(optionvalueid, code, name, optionsetid, sort_order) + select + statementBuilder.getAutoIncrementValue() + , optionvalue, optionvalue, optionsetid, ( sort_order + 1 ) + from optionsetmembers; ___ 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] (no subject)
HI Brajesh, you must properly clean all target folders (mvn clean), this means you have multiple versions of the dhis-support-external jar in your war. Lars On Fri, Aug 8, 2014 at 12:13 PM, Brajesh Murari brijeshmur...@gmail.com wrote: Hello Devs, When i am trying to build DHIS2 version 14, I am facing some issues as described, [INFO] No Transaction manager found - if your webapp requires one, please configure one. [INFO] Initializing Spring root WebApplicationContext * WARN 2014-08-08 14:54:05,316 Configuration problem: Overriding globally registered AuthenticationManager Offending resource: URL [jar:file:/C:/Users/Brajesh/.m2/repository/org/hisp/dhis/dhis-web-commons/2.14/dhis-web-commons-2.14.jar!/META-INF/dhis/security.xml] (FailFastProblemReporter.java [main]) * ERROR 2014-08-08 14:54:05,576 Context initialization failed (ContextLoader.java [main]) org.springframework.beans.factory.parsing.BeanDefinitionParsingException: Configuration problem: Only one AsyncAnnotationBeanPostProcessor may exist within the context. Offending resource: URL [jar:file:/C:/Users/Brajesh/.m2/repository/org/hisp/dhis/dhis-support-external/2.14/dhis-support-external-2.14.jar!/META-INF/dhis/beans.xml] at org.springframework.beans.factory.parsing.FailFastProblemReporter.error(FailFastProblemReporter.java:68) at org.springframework.beans.factory.parsing.ReaderContext.error(ReaderContext.java:85) at org.springframework.beans.factory.parsing.ReaderContext.error(ReaderContext.java:72) at org.springframework.scheduling.config.AnnotationDrivenBeanDefinitionParser.parse(AnnotationDrivenBeanDefinitionParser.java:90) Can i expect what's going wrong with dhis-web-commons-2.14.jar ! since few days before this was working as expected. -- Regards Brajesh Murari Phone: (+91)-96-43-208375(O) (+91)-99-53-787977(P) P please consider the environment before printing this email ___ 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 16350: changes to options reflected in event capture
revno: 16350 committer: Abyot Asalefew Gizaw aby...@gmail.com branch nick: dhis2 timestamp: Fri 2014-08-08 13:18:55 +0200 message: changes to options reflected in event capture modified: dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/scripts/event-capture.js dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/scripts/services.js dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/views/defaultForm.html -- 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-event-capture/src/main/webapp/dhis-web-event-capture/scripts/event-capture.js' --- dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/scripts/event-capture.js 2014-07-09 09:33:55 + +++ dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/scripts/event-capture.js 2014-08-08 11:18:55 + @@ -394,7 +394,7 @@ { return function() { return $.ajax( { -url: '../api/optionSets.json?filter=id:eq:' + id +'fields=id,name,version,options', +url: '../api/optionSets.json?filter=id:eq:' + id +'fields=id,name,version,options[id,name,code]', type: 'GET' }).done( function( response ){ _.each( _.values( response.optionSets ), function( optionSet ) { === modified file 'dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/scripts/services.js' --- dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/scripts/services.js 2014-07-06 12:46:18 + +++ dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/scripts/services.js 2014-08-08 11:18:55 + @@ -241,7 +241,7 @@ this.getAttributesAsString(attributes) + ' ng-model=currentEvent.' + deId + ' ' + ' ng-required=programStageDataElements.' + deId + '.compulsory' + -' typeahead=option for option in programStageDataElements.'+deId+'.dataElement.optionSet.options | filter:$viewValue | limitTo:20' + +' typeahead=option.code as option.name for option in programStageDataElements.'+deId+'.dataElement.optionSet.options | filter:$viewValue | limitTo:20' + ' typeahead-open-on-focus ng-required=programStageDataElements.'+deId+'.compulsory'; } if(programStageDataElements[deId].dataElement.type == bool){ === modified file 'dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/views/defaultForm.html' --- dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/views/defaultForm.html 2014-08-01 12:22:15 + +++ dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/views/defaultForm.html 2014-08-08 11:18:55 + @@ -75,7 +75,7 @@ div class=container-fluid input type=text ng-model=currentEvent[eventGridColumn.id] - typeahead=option for option in programStageDataElements[eventGridColumn.id].dataElement.optionSet.options | filter:$viewValue | limitTo:20 + typeahead=option.code as option.name for option in programStageDataElements[eventGridColumn.id].dataElement.optionSet.options | filter:$viewValue | limitTo:20 typeahead-open-on-focus ng-required={{eventGridColumn.compulsory}} name=foo ___ 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] Problem with resetting password on 2.15
Renier, See below Elmarie Claasen HISP Cell 0823742209 Tel 0413640757 On 08 Aug 2014, at 11:39 AM, Knut Staring knu...@gmail.com wrote: To be even more explicit, you could try also running the following SQL query: update users set passwordlastupdated = '2014-08-08' On 8/8/14, Morten Olav Hansen morte...@gmail.com wrote: Hi Elmarie, Did you try this again? did you manage to get it working? We have had reports of this happening one time before, but I could never reproduce it here locally.. Could you tell me more about your setup? exact dhis version, browser, did you clear the cache etc. Did the column users.passwordlastupdated get updated? If this happens, and locks people out, probably the simplest solution is to simple set passwordlastupdated to todays date (but please try on test server). -- Morten On Wed, Aug 6, 2014 at 4:16 PM, Elmarie Claasen elma...@hisp.org wrote: Thanks Knut we will try this. Regards, *Elmarie Claasen* [image: Hisp logo] Project Manager Health Information Systems Programme Tel: 041-367 1027 Cell: 082 374 2209 E-mail: elma...@hisp.org Skype: elmarie.claasen52 *From:* Knut Staring [mailto:knu...@gmail.com] *Sent:* 06 August 2014 10:41 AM *To:* Elmarie Claasen *Cc:* DHIS 2 developers *Subject:* Re: [Dhis2-devs] Problem with resetting password on 2.15 Hi Elmarie, This is just a partial solution, but hopefully will restore your access to the system. Assuming you have direct access to the database (on the command line or through PgAdmin), you can run the following: update users set password = '48e8f1207baef1ef7fe478a57d19f2e5' where username = 'admin' This should enable you to log in with the default admin/district. But of course you should then proceed to change this password. Knut On Wed, Aug 6, 2014 at 10:28 AM, Elmarie Claasen elma...@hisp.org wrote: Hi all, We have a problem with a database in which we activated the option that passwords must be reset every x months. Suddenly all of the Superusers are getting a message to reset the password which you follow and ‘save’ but saving does not log you into the database. When you go back to the login screen try to log in with the new password it says incorrect password because it evidently did not save the password. When you use the old password you simply get the same message to change your password. The database is on 2.15. We are now effectively logged out of the database – please help! Regards, *Elmarie Claasen* [image: Hisp logo] Project Manager Health Information Systems Programme Tel: 041-367 1027 Cell: 082 374 2209 E-mail: elma...@hisp.org Skype: elmarie.claasen52 ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp -- Knut Staring Dept. of Informatics, University of Oslo +4791880522 http://dhis2.org ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp -- Knut Staring Dept. of Informatics, University of Oslo +4791880522 http://dhis2.org ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
Re: [Dhis2-devs] Problem with resetting password on 2.15
Hi Morten, Thanks will send this to our system admin to run and get back to you if it works. Renier, Please run and give feedback Elmarie Claasen HISP Cell 0823742209 Tel 0413640757 On 08 Aug 2014, at 10:22 AM, Morten Olav Hansen morte...@gmail.com wrote: Hi Elmarie, Did you try this again? did you manage to get it working? We have had reports of this happening one time before, but I could never reproduce it here locally.. Could you tell me more about your setup? exact dhis version, browser, did you clear the cache etc. Did the column users.passwordlastupdated get updated? If this happens, and locks people out, probably the simplest solution is to simple set passwordlastupdated to todays date (but please try on test server). -- Morten On Wed, Aug 6, 2014 at 4:16 PM, Elmarie Claasen elma...@hisp.org wrote: Thanks Knut we will try this. Regards, Elmarie Claasen image001.png Project Manager Health Information Systems Programme Tel: 041-367 1027 Cell: 082 374 2209 E-mail: elma...@hisp.org Skype: elmarie.claasen52 From: Knut Staring [mailto:knu...@gmail.com] Sent: 06 August 2014 10:41 AM To: Elmarie Claasen Cc: DHIS 2 developers Subject: Re: [Dhis2-devs] Problem with resetting password on 2.15 Hi Elmarie, This is just a partial solution, but hopefully will restore your access to the system. Assuming you have direct access to the database (on the command line or through PgAdmin), you can run the following: update users set password = '48e8f1207baef1ef7fe478a57d19f2e5' where username = 'admin' This should enable you to log in with the default admin/district. But of course you should then proceed to change this password. Knut On Wed, Aug 6, 2014 at 10:28 AM, Elmarie Claasen elma...@hisp.org wrote: Hi all, We have a problem with a database in which we activated the option that passwords must be reset every x months. Suddenly all of the Superusers are getting a message to reset the password which you follow and ‘save’ but saving does not log you into the database. When you go back to the login screen try to log in with the new password it says incorrect password because it evidently did not save the password. When you use the old password you simply get the same message to change your password. The database is on 2.15. We are now effectively logged out of the database – please help! Regards, Elmarie Claasen image001.png Project Manager Health Information Systems Programme Tel: 041-367 1027 Cell: 082 374 2209 E-mail: elma...@hisp.org Skype: elmarie.claasen52 ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp -- Knut Staring Dept. of Informatics, University of Oslo +4791880522 http://dhis2.org ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp ___ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16351: DV filter bug fixed.
Merge authors: Jan Henrik Øverland (janhenrik-overland) revno: 16351 [merge] committer: Jan Henrik Overland janhenrik.overl...@gmail.com branch nick: dhis2 timestamp: Fri 2014-08-08 14:24:03 +0200 message: DV filter bug fixed. modified: dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/index.html dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js -- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription === modified file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/index.html' --- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/index.html 2013-10-29 15:36:41 + +++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/index.html 2014-08-08 11:08:16 + @@ -15,6 +15,15 @@ script src=../../dhis-web-commons/javascripts/ext-ux/layout/component/form/MultiSelect.js/script script src=../../dhis-web-commons/javascripts/ext-ux/form/MultiSelect.js/script +!-- +script src=../../dhis-web-commons/javascripts/jQuery/jquery.min.js/script +script src=../../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.min.js/script +script src=../../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.picker.min.js/script +script src=../../dhis-web-commons/javascripts/dhis2/dhis2.util.js/script + +script src=../../dhis-web-commons/javascripts/dhis2/dhis2.period.js/script +-- + script src=../../dhis-web-commons/javascripts/periodTypeNoDep.js/script script src=scripts/core.js/script script src=scripts/app.js/script === 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 2014-08-07 10:42:08 + +++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js 2014-08-08 11:08:16 + @@ -6055,12 +6055,34 @@ Ext.Ajax.request({ url: init.contextPath + '/api/system/info.json', success: function(r) { -var info = Ext.decode(r.responseText); +var info = Ext.decode(r.responseText), +dhis2PeriodUrl = '../../dhis-web-commons/javascripts/dhis2/dhis2.period.js', +calendarMap = {'iso8601': 'gregorian'}, +calendarUrl; + +// calendar +init.calendar = calendarMap[info.calendar] || info.calendar || 'gregorian'; +init.dateFormat = info.dateFormat || '-mm-dd'; + +//if (Ext.Array.contains(['coptic', 'ethiopian', 'islamic', 'julian', 'nepali', 'thai'], init.calendar)) { +//calendarUrl = '../../dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.' + init.calendar + '.min.js'; + +//Ext.Loader.injectScriptElement(calendarUrl, function() { +//Ext.Loader.injectScriptElement(dhis2PeriodUrl, function() {}); +//}); +//} +//else { +//Ext.Loader.injectScriptElement(dhis2PeriodUrl, function() { +//var cal = $.calendars.instance('gregorian'), +//gen = new dhis2.period.PeriodGenerator(cal, init.dateFormat); + +//console.log(gen.generateReversedPeriods('Yearly', 0)); +//}); +//} + +// context path init.contextPath = info.contextPath || init.contextPath; -// calendar -init.calendar = info.calendar; - // i18n requests.push({ url: init.contextPath + '/api/i18n?package=org.hisp.dhis.pivot', === modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js' --- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2014-07-24 23:39:15 + +++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2014-08-08 12:23:05 + @@ -2126,9 +2126,9 @@ web.chart.getLayoutConfig = function() { var panels = ns.app.accordion.panels, - columnDimNames = [ns.app.stores.col.getDimensionNames()], -
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16352: Spring security, setting X-Content-Type-Options: nosniff, X-Frame-Options: DENY, X-XSS-Protection...
revno: 16352 committer: Lars Helge Overland larshe...@gmail.com branch nick: dhis2 timestamp: Fri 2014-08-08 15:04:42 +0200 message: Spring security, setting X-Content-Type-Options: nosniff, X-Frame-Options: DENY, X-XSS-Protection: 1; mode=block headers to prevent XSS attacks. modified: dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.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-commons/src/main/resources/META-INF/dhis/security.xml' --- dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml 2014-07-09 09:26:23 + +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml 2014-08-08 13:04:42 + @@ -39,6 +39,12 @@ login-page=/dhis-web-commons/security/login.action authentication-success-handler-ref=defaultAuthenticationSuccessHandler / +sec:headers + sec:content-type-options / + sec:frame-options / + sec:xss-protection / +/sec:headers + sec:http-basic / sec:logout logout-url=/dhis-web-commons-security/logout.action / sec:intercept-url pattern=/dhis-web-commons/i18nJavaScript.action access=permitAll() / ___ 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 16354: PT DV table layout window fix.
Merge authors: Jan Henrik Øverland (janhenrik-overland) revno: 16354 [merge] committer: Jan Henrik Overland janhenrik.overl...@gmail.com branch nick: dhis2 timestamp: Fri 2014-08-08 15:22:17 +0200 message: PT DV table layout window fix. modified: dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js -- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription === modified file 'dhis-2/dhis-web/dhis-web-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 2014-08-08 11:08:16 + +++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js 2014-08-08 13:15:52 + @@ -83,6 +83,18 @@ return Ext.clone(dimensionNames); }; +config.hasDimension = function(id) { +return Ext.isString(id) this.findExact('id', id) != -1 ? true : false; +}; + +config.removeDimension = function(id) { +var index = this.findExact('id', id); + +if (index != -1) { +this.remove(this.getAt(index)); +} +}; + return Ext.create('Ext.data.Store', config); }; @@ -270,6 +282,10 @@ if (!hasDimension(record.id)) { store.add(record); } + +if (store !== dimensionStore dimensionStore.hasDimension(record.id)) { +dimensionStore.removeDimension(record.id); +} }; removeDimension = function(dataElementId) { @@ -277,10 +293,9 @@ for (var i = 0, store, index; i stores.length; i++) { store = stores[i]; -index = store.findExact('id', dataElementId); -if (index != -1) { -store.remove(store.getAt(index)); +if (store.hasDimension(dataElementId)) { +store.removeDimension(dataElementId); dimensionStoreMap[dataElementId] = store; } } @@ -290,10 +305,7 @@ var stores = [colStore, rowStore, filterStore]; for (var i = 0, store, index; i stores.length; i++) { -store = stores[i]; -index = store.findExact('id', id); - -if (index != -1) { +if (stores[i].hasDimension(id)) { return true; } } === modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js' --- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2014-08-08 12:23:05 + +++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2014-08-08 13:21:16 + @@ -83,6 +83,18 @@ return Ext.clone(dimensionNames); }; +config.hasDimension = function(id) { +return Ext.isString(id) this.findExact('id', id) != -1 ? true : false; +}; + +config.removeDimension = function(id) { +var index = this.findExact('id', id); + +if (index != -1) { +this.remove(this.getAt(index)); +} +}; + return Ext.create('Ext.data.Store', config); }; @@ -306,6 +318,10 @@ if (!hasDimension(record.id)) { store.add(record); } + +if (store !== dimensionStore dimensionStore.hasDimension(record.id)) { +dimensionStore.removeDimension(record.id); +} }; removeDimension = function(dataElementId) { @@ -313,10 +329,9 @@ for (var i = 0, store, index; i stores.length; i++) { store = stores[i]; -index = store.findExact('id', dataElementId); -if (index != -1) { -store.remove(store.getAt(index)); +if (store.hasDimension(dataElementId)) { +store.removeDimension(dataElementId); dimensionStoreMap[dataElementId] = store; } } @@ -326,10 +341,7 @@ var stores = [colStore, rowStore, filterStore]; for (var i = 0, store, index; i stores.length; i++) { -store = stores[i]; -index = store.findExact('id', id); - -if (index != -1) { +if (stores[i].hasDimension(id)) { return true; } } ___ Mailing list:
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16353: reflect changes made to option data model in the web api
revno: 16353 committer: Abyot Asalefew Gizaw aby...@gmail.com branch nick: dhis2 timestamp: Fri 2014-08-08 15:10:50 +0200 message: reflect changes made to option data model in the web api modified: dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttribute.java dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/AbstractTrackedEntityInstanceService.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/trackedentity/TrackedEntityAttribute.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttribute.java 2014-07-02 12:11:16 + +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttribute.java 2014-08-08 13:10:50 + @@ -33,6 +33,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; + import org.hisp.dhis.common.BaseDimensionalObject; import org.hisp.dhis.common.BaseIdentifiableObject; import org.hisp.dhis.common.DxfNamespaces; @@ -40,6 +41,7 @@ import org.hisp.dhis.common.view.DetailedView; import org.hisp.dhis.common.view.ExportView; import org.hisp.dhis.common.view.WithoutOrganisationUnitsView; +import org.hisp.dhis.option.Option; import org.hisp.dhis.option.OptionSet; /** @@ -93,9 +95,9 @@ private Boolean displayInListNoProgram = false; private Integer sortOrderInListNoProgram; - + private Boolean confidential = false; - + private Boolean unique = false; // For Local ID type @@ -113,8 +115,8 @@ setAutoFields(); } -public TrackedEntityAttribute( String name, String description, String valueType, -Boolean inherit, Boolean displayOnVisitSchedule ) +public TrackedEntityAttribute( String name, String description, String valueType, Boolean inherit, +Boolean displayOnVisitSchedule ) { this.name = name; this.description = description; @@ -181,7 +183,7 @@ } @JsonProperty( trackedEntityAttributeGroup ) -@JsonView( { DetailedView.class } ) +@JsonView( { DetailedView.class } ) @JsonSerialize( as = BaseIdentifiableObject.class ) @JacksonXmlProperty( localName = trackedEntityAttributeGroup, namespace = DxfNamespaces.DXF_2_0 ) public TrackedEntityAttributeGroup getAttributeGroup() @@ -325,7 +327,7 @@ { this.confidential = confidential; } - + // - // Static methods // - @@ -354,4 +356,17 @@ programScope = trackedEntityAttribute.getProgramScope(); } } + +public Boolean isValidOptionValue( String value ) +{ +for ( Option option : this.getOptionSet().getOptions() ) +{ +if ( option.getCode().equals( value ) ) +{ +return true; +} +} + +return false; +} } === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/AbstractTrackedEntityInstanceService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/AbstractTrackedEntityInstanceService.java 2014-07-18 14:27:18 + +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/AbstractTrackedEntityInstanceService.java 2014-08-08 13:10:50 + @@ -513,7 +513,7 @@ importConflicts.add( new ImportConflict( Attribute.value, Value is not pointing to a valid username for attribute: + attribute ) ); } } -else if ( TrackedEntityAttribute.TYPE_OPTION_SET.equals( teAttribute.getValueType() ) !teAttribute.getOptionSet().getOptions().contains( attribute.getValue() ) ) +else if ( TrackedEntityAttribute.TYPE_OPTION_SET.equals( teAttribute.getValueType() ) !teAttribute.isValidOptionValue( attribute.getValue() ) ) { importConflicts.add( new ImportConflict( Attribute.value, Value is not pointing to a valid option for attribute: + attribute ) ); } ___ 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 1339720] Re: DHIS2.16 Duplicating Dimensions in Table Layout
** Changed in: dhis2 Status: New = 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/1339720 Title: DHIS2.16 Duplicating Dimensions in Table Layout Status in DHIS 2: Fix Committed Bug description: Hi devs, Not a big deal but could be quite confusing for the user. If you select a multiple OU or DE dimensions to use in your table layout, these are duplicated every time you reselect from a previous dimension. I have replicated this on the demo site and attached a screenshot for your reference. You can follow these steps if you want to replicate 1) Select ANC Data elements in Pivot Table 2) Select This Year 3) Select Facility Type (Hospital) 4) Update Table 5) Select Facility Ownership (Public) 6) Remove Facility Type from Table Layout 7) Update 8) Select Facility Type (Clinic) You will find that a new Faciity Type Dimension is added to the Table layout. To manage notifications about this bug go to: https://bugs.launchpad.net/dhis2/+bug/1339720/+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
[Dhis2-devs] [Branch ~dhis2-devs-core/dhis2/trunk] Rev 16355: DV store sorting bug fixed.
Merge authors: Jan Henrik Øverland (janhenrik-overland) revno: 16355 [merge] committer: Jan Henrik Overland janhenrik.overl...@gmail.com branch nick: dhis2 timestamp: Fri 2014-08-08 15:41:09 +0200 message: DV store sorting bug fixed. modified: dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js -- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription === modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js' --- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2014-08-08 13:21:16 + +++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2014-08-08 13:40:45 + @@ -4869,6 +4869,9 @@ this.isPending = false; ns.core.web.multiSelect.filterAvailable({store: availableStore}, {store: selectedStore}); +}, +sortStore: function() { + this.sort('name', 'ASC'); } }); ___ 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 16356: changes to options reflected in tracker capture
revno: 16356 committer: Abyot Asalefew Gizaw aby...@gmail.com branch nick: dhis2 timestamp: Fri 2014-08-08 16:59:22 +0200 message: changes to options reflected in tracker capture modified: dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/profile/profile.html dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/registration/registration.html dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/relationship/registration.html dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/relationship/search.html dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/services.js dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/scripts/tracker-capture.js dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/search.html -- 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-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html' --- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html 2014-07-13 13:08:50 + +++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html 2014-08-08 14:59:22 + @@ -34,7 +34,7 @@ ng-class='getInputNotifcationClass(prStDe.dataElement.id,false)' ng-model=currentEvent[prStDe.dataElement.id] ng-required={{prStDe.compulsory}} - typeahead=option for option in prStDe.dataElement.optionSet.options | filter:$viewValue | limitTo:20 + typeahead=option.code as option.name for option in prStDe.dataElement.optionSet.options | filter:$viewValue | limitTo:20 typeahead-open-on-focus ng-blur=saveDatavalue(prStDe) name=foo/ === modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/profile/profile.html' --- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/profile/profile.html 2014-07-25 10:09:00 + +++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/profile/profile.html 2014-08-08 14:59:22 + @@ -44,7 +44,7 @@ name=foo class=form-control ng-model=attribute.value - typeahead=option for option in attributes[attribute.attribute].optionSet.options | filter:$viewValue | limitTo:20 + typeahead=option.code as option.name for option in attributes[attribute.attribute].optionSet.options | filter:$viewValue | limitTo:20 typeahead-open-on-focus ng-disabled=!editProfile ng-required=attribute.mandatory/ span ng-show=outerForm.submitted innerForm.foo.$invalid class=error{{'required'| translate}} - {{attribute.type}}/span === modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/registration/registration.html' --- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/registration/registration.html 2014-07-25 10:09:00 + +++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/registration/registration.html 2014-08-08 14:59:22 + @@ -47,7 +47,7 @@ name=foo class=form-control ng-model=attribute.value - typeahead=option for option in attribute.optionSet.options | filter:$viewValue | limitTo:20 + typeahead=option.code as option.name for option in attribute.optionSet.options | filter:$viewValue | limitTo:20
[Dhis2-devs] road map
Hi, we have made a road map which outlines the broad lines of the development plan of the DHIS 2 software for the next 9 months: https://www.dhis2.org/roadmap The individual features are subject to change. regards, Lars ___ 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 16357: Dashboard, css
revno: 16357 committer: Lars Helge Overland larshe...@gmail.com branch nick: dhis2 timestamp: Fri 2014-08-08 20:42:52 +0200 message: Dashboard, css modified: dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css -- 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-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css' --- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css 2014-08-08 06:52:54 + +++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css 2014-08-08 18:42:52 + @@ -101,30 +101,14 @@ margin: 0 19px 19px 0; border-radius: 3px; cursor: pointer; - box-shadow: #ddd 0 1px 3px 0; + box-shadow: #ddd 0 1px 2px 0; overflow: auto; } -.item h3 -{ - font-size: 12px; - font-weight: bold; - color: #39547d; - margin: 2px 6px 7px 0px; -} - -.item h4 -{ - font-size: 12px; - font-weight: bold; - color: #39547d; - margin: 1px 5px 5px 0px; -} - .item:hover { border: 1px solid #bbb; - box-shadow: #ccc 0 1px 3px 0; + box-shadow: #ccc 0 1px 2px 0; } .item::-webkit-scrollbar @@ -133,6 +117,22 @@ height: 8px; } +.item h3 +{ + font-size: 12px; + font-weight: bold; + color: #39547d; + margin: 2px 6px 7px 0px; +} + +.item h4 +{ + font-size: 12px; + font-weight: bold; + color: #39547d; + margin: 1px 5px 5px 0px; +} + .dropItem { width: 405px; ___ 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