dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #22112
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 10609: save optionsets offline, not available for entry yet
------------------------------------------------------------
revno: 10609
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-04-18 13:05:48 +0700
message:
save optionsets offline, not available for entry yet
added:
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/GetOptionSetAction.java
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonOptionSet.vm
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.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
=== added file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/GetOptionSetAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/GetOptionSetAction.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/GetOptionSetAction.java 2013-04-18 06:05:48 +0000
@@ -0,0 +1,81 @@
+package org.hisp.dhis.caseentry.action;
+
+/*
+ * Copyright (c) 2004-2013, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import com.opensymphony.xwork2.Action;
+import org.hisp.dhis.option.OptionService;
+import org.hisp.dhis.option.OptionSet;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * @author Morten Olav Hansen <mortenoh@xxxxxxxxx>
+ */
+public class GetOptionSetAction implements Action
+{
+ // -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+
+ @Autowired
+ private OptionService optionService;
+
+ // -------------------------------------------------------------------------
+ // Input & Output
+ // -------------------------------------------------------------------------
+
+ private String optionSetUid;
+
+ public void setOptionSetUid( String optionSetUid )
+ {
+ this.optionSetUid = optionSetUid;
+ }
+
+ private OptionSet optionSet;
+
+ public OptionSet getOptionSet()
+ {
+ return optionSet;
+ }
+
+ // -------------------------------------------------------------------------
+ // Action Impl
+ // -------------------------------------------------------------------------
+
+ @Override
+ public String execute() throws Exception
+ {
+ if ( optionSetUid == null )
+ {
+ return INPUT;
+ }
+
+ optionSet = optionService.getOptionSet( optionSetUid );
+
+ return SUCCESS;
+ }
+}
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml 2013-04-17 08:45:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml 2013-04-18 06:05:48 +0000
@@ -1135,4 +1135,7 @@
class="org.hisp.dhis.caseentry.action.caseentry.UploadAnonymousEventAction" scope="prototype">
</bean>
+ <bean id="org.hisp.dhis.caseentry.action.GetOptionSetAction"
+ class="org.hisp.dhis.caseentry.action.GetOptionSetAction" scope="prototype">
+ </bean>
</beans>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml 2013-04-17 08:45:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml 2013-04-18 06:05:48 +0000
@@ -171,6 +171,10 @@
</result>
</action>
+ <action name="getOptionSet" class="org.hisp.dhis.caseentry.action.GetOptionSetAction">
+ <result name="success" type="velocity-json">/dhis-web-caseentry/jsonOptionSet.vm</result>
+ </action>
+
<action name="removeCurrentEncounter"
class="org.hisp.dhis.caseentry.action.caseentry.RemoveCurrentEncounterAction">
<result name="success" type="velocity-json">
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js 2013-04-17 08:53:47 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js 2013-04-18 06:05:48 +0000
@@ -2,7 +2,8 @@
var PROGRAMS_STORE = 'anonymousPrograms';
var PROGRAM_STAGES_STORE = 'anonymousProgramStages';
-var OFFLINE_DATA_STORE = 'anonymousExecutionDates';
+var OPTION_SET_STORE = 'optionSets';
+var OFFLINE_DATA_STORE = 'anonymousOfflineData';
function initalizeProgramStages() {
DAO.programStages = new dhis2.storage.Store( {name: PROGRAM_STAGES_STORE, adapter: 'dom-ss'}, function(store) {
@@ -16,6 +17,8 @@
var keys = _.keys( data.metaData.programs );
var objs = _.values( data.metaData.programs );
+ loadOptionSets( data.metaData.optionSets );
+
DAO.programs.addAll( keys, objs, function ( store ) {
var deferred = $.Deferred();
var promise = deferred.promise();
@@ -975,3 +978,22 @@
}
});
}
+
+function loadOptionSets(optionSetUids, success ) {
+ DAO.optionSets = new dhis2.storage.Store( {name: OPTION_SET_STORE, adapter: 'dom-ss'}, function ( store ) {
+ var deferred = $.Deferred();
+ var promise = deferred.promise();
+
+ _.each( optionSetUids, function(item, idx) {
+ promise = promise.pipe($.ajax({
+ url: 'getOptionSet.action?optionSetUid=' + item,
+ dataType: 'json',
+ success: function(json) {
+ DAO.optionSets.add(item, json);
+ }
+ }));
+ });
+
+ deferred.resolve();
+ } );
+}
=== added file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonOptionSet.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonOptionSet.vm 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonOptionSet.vm 2013-04-18 06:05:48 +0000
@@ -0,0 +1,6 @@
+{ "optionSet": {
+ "uid": "$encoder.jsonEncode( $optionSet.uid )",
+ "name": "$encoder.jsonEncode( $optionSet.displayName )",
+ "options": [#foreach( $option in $optionSet.options )"$encoder.jsonEncode( $option )"#if( $velocityCount < $optionSet.options.size() ),#end #end]
+ }
+}
