dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #30231
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 15331: remove TrackedEntityMobileSetting and all related services, actions
------------------------------------------------------------
revno: 15331
committer: Long <long.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Wed 2014-05-21 16:48:18 +0700
message:
remove TrackedEntityMobileSetting and all related services, actions
removed:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityMobileSetting.java
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/TrackedEntityMobileSettingService.java
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/TrackedEntityMobileSettingStore.java
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/DefaultTrackedEntityMobileSettingService.java
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/HibernateTrackedEntityMobileSettingStore.java
dhis-2/dhis-services/dhis-service-mobile/src/main/resources/org/hisp/dhis/mobile/TrackedEntityMobileSetting.hbm.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/ShowMobileSettingFormAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/UpdateMobileSettingAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/patientSettings.vm
modified:
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java
dhis-2/dhis-services/dhis-service-mobile/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/J2meClientUpdateAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/index.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/menu.vm
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityMobileSetting.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityMobileSetting.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityMobileSetting.java 1970-01-01 00:00:00 +0000
@@ -1,94 +0,0 @@
-package org.hisp.dhis.trackedentity;
-
-/*
- * Copyright (c) 2004-2014, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class TrackedEntityMobileSetting
-{
- public static final long serialVersionUID = -5947521380646718129L;
-
- private int id;
-
- private Boolean autoUpdateClient = false;
-
- private Double versionToUpdate;
-
- private List<TrackedEntityAttribute> attributes = new ArrayList<TrackedEntityAttribute>();
-
- public TrackedEntityMobileSetting()
- {
- }
-
- public int getId()
- {
- return id;
- }
-
- public void setId( int id )
- {
- this.id = id;
- }
-
- public List<TrackedEntityAttribute> getAttributes()
- {
- return attributes;
- }
-
- public void setAttributes( List<TrackedEntityAttribute> attributes )
- {
- this.attributes = attributes;
- }
-
- public Boolean getAutoUpdateClient()
- {
- return autoUpdateClient;
- }
-
- public void setAutoUpdateClient( Boolean autoUpdateClient )
- {
- this.autoUpdateClient = autoUpdateClient;
- }
-
- public double getVersionToUpdate()
- {
- if ( versionToUpdate != null )
- {
- return versionToUpdate;
- }
-
- return 0;
- }
-
- public void setVersionToUpdate( Double versionToUpdate )
- {
- this.versionToUpdate = versionToUpdate;
- }
-}
=== removed file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/TrackedEntityMobileSettingService.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/TrackedEntityMobileSettingService.java 2014-05-20 15:38:30 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/TrackedEntityMobileSettingService.java 1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-package org.hisp.dhis.api.mobile;
-
-/*
- * Copyright (c) 2004-2014, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.util.Collection;
-
-import org.hisp.dhis.trackedentity.TrackedEntityMobileSetting;
-
-public interface TrackedEntityMobileSettingService
-{
- int saveTrackedEntityMobileSetting( TrackedEntityMobileSetting setting );
-
- void updateTrackedEntityMobileSetting( TrackedEntityMobileSetting setting );
-
- Collection<TrackedEntityMobileSetting> getCurrentSetting();
-
- TrackedEntityMobileSetting get( int id );
-
-}
=== removed file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/TrackedEntityMobileSettingStore.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/TrackedEntityMobileSettingStore.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/TrackedEntityMobileSettingStore.java 1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-package org.hisp.dhis.api.mobile;
-
-/*
- * Copyright (c) 2004-2014, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.util.Collection;
-
-import org.hisp.dhis.common.GenericStore;
-import org.hisp.dhis.trackedentity.TrackedEntityMobileSetting;
-
-public interface TrackedEntityMobileSettingStore
- extends GenericStore<TrackedEntityMobileSetting>
-{
- Collection<TrackedEntityMobileSetting> getCurrentSetting();
-}
=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java 2014-05-21 09:03:33 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java 2014-05-21 09:48:18 +0000
@@ -44,7 +44,6 @@
import org.hisp.dhis.api.mobile.ActivityReportingService;
import org.hisp.dhis.api.mobile.NotAllowedException;
-import org.hisp.dhis.api.mobile.TrackedEntityMobileSettingService;
import org.hisp.dhis.api.mobile.model.Activity;
import org.hisp.dhis.api.mobile.model.ActivityPlan;
import org.hisp.dhis.api.mobile.model.ActivityValue;
@@ -92,7 +91,6 @@
import org.hisp.dhis.trackedentity.TrackedEntityInstance;
import org.hisp.dhis.trackedentity.TrackedEntityInstanceQueryParams;
import org.hisp.dhis.trackedentity.TrackedEntityInstanceService;
-import org.hisp.dhis.trackedentity.TrackedEntityMobileSetting;
import org.hisp.dhis.trackedentityattributevalue.TrackedEntityAttributeValue;
import org.hisp.dhis.trackedentityattributevalue.TrackedEntityAttributeValueService;
import org.hisp.dhis.trackedentitydatavalue.TrackedEntityDataValue;
@@ -132,8 +130,6 @@
private TrackedEntityDataValueService dataValueService;
- private TrackedEntityMobileSettingService mobileSettingService;
-
private ProgramStageSectionService programStageSectionService;
private ProgramInstanceService programInstanceService;
@@ -200,17 +196,6 @@
this.attValueService = attValueService;
}
- @Required
- public void setMobileSettingService( TrackedEntityMobileSettingService mobileSettingService )
- {
- this.mobileSettingService = mobileSettingService;
- }
-
- public void setSetting( TrackedEntityMobileSetting setting )
- {
- this.setting = setting;
- }
-
public void setGroupByAttribute( TrackedEntityAttribute groupByAttribute )
{
this.groupByAttribute = groupByAttribute;
@@ -268,8 +253,6 @@
// MobileDataSetService
// -------------------------------------------------------------------------
- private TrackedEntityMobileSetting setting;
-
private TrackedEntityAttribute groupByAttribute;
@Override
@@ -711,30 +694,9 @@
{
Beneficiary beneficiary = new Beneficiary();
List<org.hisp.dhis.api.mobile.model.PatientAttribute> patientAtts = new ArrayList<org.hisp.dhis.api.mobile.model.PatientAttribute>();
- List<TrackedEntityAttribute> atts;
-
beneficiary.setId( patient.getId() );
beneficiary.setName( patient.getName() );
- this.setSetting( getSettings() );
-
- if ( setting != null )
- {
- atts = setting.getAttributes();
- for ( TrackedEntityAttribute each : atts )
- {
- TrackedEntityAttributeValue value = attValueService.getTrackedEntityAttributeValue( patient, each );
- if ( value != null )
- {
- // patientAtts.add( new TrackedEntityAttribute(
- // each.getName(),
- // value.getValue(), each.getValueType(),
- // new ArrayList<String>() ) );
- }
- }
-
- }
-
// Set attribute which is used to group beneficiary on mobile (only if
// there is attribute which is set to be group factor)
org.hisp.dhis.api.mobile.model.PatientAttribute beneficiaryAttribute = null;
@@ -779,8 +741,6 @@
patientModel.setTrackedEntityName( "" );
}
- this.setSetting( getSettings() );
-
List<TrackedEntityAttributeValue> atts = new ArrayList<TrackedEntityAttributeValue>(
patient.getAttributeValues() );
@@ -1041,16 +1001,6 @@
return mobileDataElements;
}
- private TrackedEntityMobileSetting getSettings()
- {
- TrackedEntityMobileSetting setting = null;
-
- Collection<TrackedEntityMobileSetting> currentSetting = mobileSettingService.getCurrentSetting();
- if ( currentSetting != null && !currentSetting.isEmpty() )
- setting = currentSetting.iterator().next();
- return setting;
- }
-
private boolean isNumber( String value )
{
try
=== removed file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/DefaultTrackedEntityMobileSettingService.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/DefaultTrackedEntityMobileSettingService.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/DefaultTrackedEntityMobileSettingService.java 1970-01-01 00:00:00 +0000
@@ -1,80 +0,0 @@
-package org.hisp.dhis.mobile.service;
-
-/*
- * Copyright (c) 2004-2014, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.util.Collection;
-
-import org.hisp.dhis.api.mobile.TrackedEntityMobileSettingService;
-import org.hisp.dhis.api.mobile.TrackedEntityMobileSettingStore;
-import org.hisp.dhis.trackedentity.TrackedEntityMobileSetting;
-import org.springframework.transaction.annotation.Transactional;
-
-@Transactional
-public class DefaultTrackedEntityMobileSettingService
- implements TrackedEntityMobileSettingService
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private TrackedEntityMobileSettingStore mobileSettingStore;
-
- public void setMobileSettingStore( TrackedEntityMobileSettingStore mobileSettingStore )
- {
- this.mobileSettingStore = mobileSettingStore;
- }
-
- // -------------------------------------------------------------------------
- // Implementation methods
- // -------------------------------------------------------------------------
-
- @Override
- public int saveTrackedEntityMobileSetting( TrackedEntityMobileSetting setting )
- {
- return mobileSettingStore.save( setting );
- }
-
- @Override
- public void updateTrackedEntityMobileSetting( TrackedEntityMobileSetting setting )
- {
- mobileSettingStore.update( setting );
- }
-
- @Override
- public Collection<TrackedEntityMobileSetting> getCurrentSetting()
- {
- return mobileSettingStore.getCurrentSetting();
- }
-
- @Override
- public TrackedEntityMobileSetting get( int id )
- {
- return mobileSettingStore.get( id );
- }
-}
=== removed file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/HibernateTrackedEntityMobileSettingStore.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/HibernateTrackedEntityMobileSettingStore.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/HibernateTrackedEntityMobileSettingStore.java 1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-package org.hisp.dhis.mobile.service;
-
-/*
- * Copyright (c) 2004-2014, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.util.Collection;
-
-import org.hibernate.Criteria;
-import org.hibernate.Session;
-import org.hisp.dhis.api.mobile.TrackedEntityMobileSettingStore;
-import org.hisp.dhis.hibernate.HibernateGenericStore;
-import org.hisp.dhis.trackedentity.TrackedEntityMobileSetting;
-import org.springframework.transaction.annotation.Transactional;
-
-@Transactional
-public class HibernateTrackedEntityMobileSettingStore
- extends HibernateGenericStore<TrackedEntityMobileSetting>
- implements TrackedEntityMobileSettingStore
-{
- @SuppressWarnings( "unchecked" )
- public Collection<TrackedEntityMobileSetting> getCurrentSetting()
- {
- Session session = sessionFactory.getCurrentSession();
- Criteria criteria = session.createCriteria( TrackedEntityMobileSetting.class );
- criteria.setCacheable( true );
- return criteria.list();
- }
-}
=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/resources/META-INF/dhis/beans.xml 2014-05-09 10:07:18 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/resources/META-INF/dhis/beans.xml 2014-05-21 09:48:18 +0000
@@ -26,8 +26,6 @@
ref="org.hisp.dhis.trackedentityattributevalue.TrackedEntityAttributeValueService" />
<property name="programStageInstanceService"
ref="org.hisp.dhis.program.ProgramStageInstanceService" />
- <property name="mobileSettingService"
- ref="org.hisp.dhis.api.mobile.TrackedEntityMobileSettingService" />
<property name="programStageSectionService"
ref="org.hisp.dhis.program.ProgramStageSectionService" />
<property name="entityInstanceService"
@@ -54,17 +52,4 @@
<property name="programService" ref="org.hisp.dhis.program.ProgramService" />
</bean>
- <bean id="org.hisp.dhis.api.mobile.TrackedEntityMobileSettingService"
- class="org.hisp.dhis.mobile.service.DefaultTrackedEntityMobileSettingService">
- <property name="mobileSettingStore"
- ref="org.hisp.dhis.api.mobile.TrackedEntityMobileSettingStore" />
- </bean>
-
- <bean id="org.hisp.dhis.api.mobile.TrackedEntityMobileSettingStore"
- class="org.hisp.dhis.mobile.service.HibernateTrackedEntityMobileSettingStore">
- <property name="clazz"
- value="org.hisp.dhis.trackedentity.TrackedEntityMobileSetting" />
- <property name="sessionFactory" ref="sessionFactory" />
- </bean>
-
</beans>
=== removed file 'dhis-2/dhis-services/dhis-service-mobile/src/main/resources/org/hisp/dhis/mobile/TrackedEntityMobileSetting.hbm.xml'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/resources/org/hisp/dhis/mobile/TrackedEntityMobileSetting.hbm.xml 2014-02-07 20:25:49 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/resources/org/hisp/dhis/mobile/TrackedEntityMobileSetting.hbm.xml 1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
- "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
- "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd";>
-
-<hibernate-mapping>
- <class name="org.hisp.dhis.trackedentity.TrackedEntityMobileSetting" table="trackedentitymobilesetting">
-
- <id name="id" column="trackedentitymobilesettingid">
- <generator class="native" />
- </id>
-
- <property name="autoUpdateClient" column="autoUpdateClient" not-null="false" />
-
- <property name="versionToUpdate" column="versionToUpdate" not-null="false" />
-
- <list name="attributes">
- <key column="trackedentitymobilesettingid" />
- <list-index column="sort_order_attributename" base="0" />
- <one-to-many class="org.hisp.dhis.trackedentity.TrackedEntityAttribute" />
- </list>
-
- </class>
-</hibernate-mapping>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/J2meClientUpdateAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/J2meClientUpdateAction.java 2014-03-27 23:16:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/J2meClientUpdateAction.java 2014-05-21 09:48:18 +0000
@@ -28,11 +28,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import java.util.List;
-
-import org.hisp.dhis.api.mobile.TrackedEntityMobileSettingService;
-import org.hisp.dhis.trackedentity.TrackedEntityMobileSetting;
-
import com.opensymphony.xwork2.Action;
/**
@@ -41,21 +36,11 @@
public class J2meClientUpdateAction
implements Action
{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private TrackedEntityMobileSettingService mobileSettingService;
-
- public void setMobileSettingService( TrackedEntityMobileSettingService mobileSettingService )
- {
- this.mobileSettingService = mobileSettingService;
- }
// -------------------------------------------------------------------------
// Input & Output
// -------------------------------------------------------------------------
-
+
private double version;
public void setVersion( double version )
@@ -64,50 +49,48 @@
}
private String autoUpdate;
-
+
public void setAutoUpdate( String autoUpdate )
{
this.autoUpdate = autoUpdate;
}
-
- private TrackedEntityMobileSetting trackedEntityMobileSetting;
-
- public TrackedEntityMobileSetting getTrackedEntityMobileSetting()
- {
- return trackedEntityMobileSetting;
- }
@Override
public String execute()
throws Exception
- {
- List<TrackedEntityMobileSetting> list;
-
- list = (List<TrackedEntityMobileSetting>) mobileSettingService.getCurrentSetting();
-
- if( list.size() == 0 )
- {
- trackedEntityMobileSetting = new TrackedEntityMobileSetting();
- }
- else
- {
- trackedEntityMobileSetting = list.get( 0 );
- }
- if ( this.version != 0 )
- {
- trackedEntityMobileSetting.setVersionToUpdate( this.version );
- }
- if ( autoUpdate != null && autoUpdate.equals( "yes" ) )
- {
- trackedEntityMobileSetting.setAutoUpdateClient( true );
- }
-
- if ( autoUpdate != null && autoUpdate.equals( "no" ) )
- {
- trackedEntityMobileSetting.setAutoUpdateClient( false );
- }
-
- mobileSettingService.saveTrackedEntityMobileSetting( this.trackedEntityMobileSetting );
+ {
+
+ //TO DO: reimplement using SystemSetting
+
+ // List<TrackedEntityMobileSetting> list;
+ //
+ // list = (List<TrackedEntityMobileSetting>)
+ // mobileSettingService.getCurrentSetting();
+ //
+ // if( list.size() == 0 )
+ // {
+ // trackedEntityMobileSetting = new TrackedEntityMobileSetting();
+ // }
+ // else
+ // {
+ // trackedEntityMobileSetting = list.get( 0 );
+ // }
+ // if ( this.version != 0 )
+ // {
+ // trackedEntityMobileSetting.setVersionToUpdate( this.version );
+ // }
+ // if ( autoUpdate != null && autoUpdate.equals( "yes" ) )
+ // {
+ // trackedEntityMobileSetting.setAutoUpdateClient( true );
+ // }
+ //
+ // if ( autoUpdate != null && autoUpdate.equals( "no" ) )
+ // {
+ // trackedEntityMobileSetting.setAutoUpdateClient( false );
+ // }
+ //
+ // mobileSettingService.saveTrackedEntityMobileSetting(
+ // this.trackedEntityMobileSetting );
return SUCCESS;
}
}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/ShowMobileSettingFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/ShowMobileSettingFormAction.java 2014-03-27 23:16:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/ShowMobileSettingFormAction.java 1970-01-01 00:00:00 +0000
@@ -1,158 +0,0 @@
-package org.hisp.dhis.mobile.action;
-
-/*
- * Copyright (c) 2004-2014, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-
-import org.hisp.dhis.api.mobile.TrackedEntityMobileSettingService;
-import org.hisp.dhis.trackedentity.TrackedEntityAttribute;
-import org.hisp.dhis.trackedentity.TrackedEntityAttributeService;
-import org.hisp.dhis.trackedentity.TrackedEntityMobileSetting;
-
-import com.opensymphony.xwork2.Action;
-
-public class ShowMobileSettingFormAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private TrackedEntityAttributeService attributeService;
-
- public void setAttributeService( TrackedEntityAttributeService attributeService )
- {
- this.attributeService = attributeService;
- }
-
- private TrackedEntityMobileSettingService mobileSettingService;
-
- public void setMobileSettingService( TrackedEntityMobileSettingService mobileSettingService )
- {
- this.mobileSettingService = mobileSettingService;
- }
-
- // -------------------------------------------------------------------------
- // Input/Output
- // -------------------------------------------------------------------------
-
- private List<TrackedEntityAttribute> patientAtts;
-
- public List<TrackedEntityAttribute> getPatientAtts()
- {
- return patientAtts;
- }
-
- public void setPatientAtts( List<TrackedEntityAttribute> patientAtts )
- {
- this.patientAtts = patientAtts;
- }
-
- private Collection<TrackedEntityAttribute> attributes;
-
- public Collection<TrackedEntityAttribute> getAttributes()
- {
- return attributes;
- }
-
- public void setAttributes( Collection<TrackedEntityAttribute> attributes )
- {
- this.attributes = attributes;
- }
-
- private List<TrackedEntityAttribute> allAttributes;
-
- public List<TrackedEntityAttribute> getAllAttributes()
- {
- return allAttributes;
- }
-
- public void setAllAttributes( List<TrackedEntityAttribute> allAttributes )
- {
- this.allAttributes = allAttributes;
- }
-
- private TrackedEntityMobileSetting setting;
-
- public TrackedEntityMobileSetting getSetting()
- {
- return setting;
- }
-
- public void setSetting( TrackedEntityMobileSetting setting )
- {
- this.setting = setting;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- @Override
- public String execute()
- throws Exception
- {
- attributes = attributeService.getAllTrackedEntityAttributes();
- allAttributes = new ArrayList<TrackedEntityAttribute>(attributes);
-
- Collection<TrackedEntityMobileSetting> paSettings = new HashSet<TrackedEntityMobileSetting>( mobileSettingService
- .getCurrentSetting() );
-
- if ( !paSettings.isEmpty() )
- {
- Iterator<TrackedEntityMobileSetting> settingsIt = paSettings.iterator();
-
- if ( settingsIt.hasNext() )
- {
- setting = settingsIt.next();
-
- patientAtts = setting.getAttributes();
-
- for ( TrackedEntityAttribute attribute : patientAtts )
- {
- if ( attributes.contains( attribute ) )
- {
- attributes.remove( attribute );
- }
- }
- }
- else
- {
- patientAtts = new ArrayList<TrackedEntityAttribute>();
- }
- }
-
- return SUCCESS;
- }
-
-}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/UpdateMobileSettingAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/UpdateMobileSettingAction.java 2014-03-27 23:16:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/UpdateMobileSettingAction.java 1970-01-01 00:00:00 +0000
@@ -1,158 +0,0 @@
-package org.hisp.dhis.mobile.action;
-
-/*
- * Copyright (c) 2004-2014, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-
-import org.hisp.dhis.api.mobile.TrackedEntityMobileSettingService;
-import org.hisp.dhis.trackedentity.TrackedEntityAttribute;
-import org.hisp.dhis.trackedentity.TrackedEntityAttributeService;
-import org.hisp.dhis.trackedentity.TrackedEntityMobileSetting;
-
-import com.opensymphony.xwork2.Action;
-
-public class UpdateMobileSettingAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private TrackedEntityAttributeService attributeService;
-
- public void setAttributeService( TrackedEntityAttributeService attributeService )
- {
- this.attributeService = attributeService;
- }
-
- private TrackedEntityMobileSettingService mobileSettingService;
-
- public void setMobileSettingService( TrackedEntityMobileSettingService mobileSettingService )
- {
- this.mobileSettingService = mobileSettingService;
- }
-
- // -------------------------------------------------------------------------
- // Input/Output
- // -------------------------------------------------------------------------
-
- private Collection<String> selectedList = new HashSet<String>();
-
- public void setSelectedList( Collection<String> selectedList )
- {
- this.selectedList = selectedList;
- }
-
- private Integer groupingAttributeId;
-
- public Integer getGroupingAttributeId()
- {
- return groupingAttributeId;
- }
-
- public void setGroupingAttributeId( Integer groupingAttributeId )
- {
- this.groupingAttributeId = groupingAttributeId;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- @Override
- public String execute()
- throws Exception
- {
-
- if ( selectedList.size() > 0 )
- {
- TrackedEntityMobileSetting setting;
- if ( mobileSettingService.getCurrentSetting().size() > 0 )
- {
- setting = mobileSettingService.getCurrentSetting().iterator().next();
- List<TrackedEntityAttribute> attributes = new ArrayList<TrackedEntityAttribute>();
- setting.setAttributes( attributes );
- fillValues( attributes );
- mobileSettingService.updateTrackedEntityMobileSetting( setting );
- }
- else
- {
- setting = new TrackedEntityMobileSetting();
- List<TrackedEntityAttribute> attributes = new ArrayList<TrackedEntityAttribute>();
- setting.setAttributes( attributes );
- fillValues( attributes );
- mobileSettingService.saveTrackedEntityMobileSetting( setting );
- }
- }
- else
- {
- TrackedEntityMobileSetting setting;
- if ( mobileSettingService.getCurrentSetting().size() > 0 )
- {
- setting = mobileSettingService.getCurrentSetting().iterator().next();
- List<TrackedEntityAttribute> attributes = new ArrayList<TrackedEntityAttribute>();
- setting.setAttributes( attributes );
- fillValues( attributes );
- mobileSettingService.updateTrackedEntityMobileSetting( setting );
- }
- else
- {
- setting = new TrackedEntityMobileSetting();
- List<TrackedEntityAttribute> attributes = new ArrayList<TrackedEntityAttribute>();
- setting.setAttributes( attributes );
- fillValues( attributes );
- mobileSettingService.saveTrackedEntityMobileSetting( setting );
- }
- }
-
- Collection<TrackedEntityAttribute> allTrackedEntityAttributes = attributeService.getAllTrackedEntityAttributes();
-
- for ( TrackedEntityAttribute patientAttribute : allTrackedEntityAttributes )
- {
- attributeService.updateTrackedEntityAttribute( patientAttribute );
- }
-
- return SUCCESS;
- }
-
- // -------------------------------------------------------------------------
- // Supporting methods
- // -------------------------------------------------------------------------
-
- private void fillValues( List<TrackedEntityAttribute> attributes )
- {
- for ( String id : selectedList )
- {
- attributes.add( attributeService.getTrackedEntityAttribute( Integer.parseInt( id ) ) );
- }
- }
-}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/META-INF/dhis/beans.xml 2014-03-27 23:16:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/META-INF/dhis/beans.xml 2014-05-21 09:48:18 +0000
@@ -64,26 +64,6 @@
<property name="userService" ref="org.hisp.dhis.user.UserService" />
</bean>
- <!-- Patient Mobile Settings -->
-
- <bean id="org.hisp.dhis.mobile.action.ShowMobileSettingFormAction"
- class="org.hisp.dhis.mobile.action.ShowMobileSettingFormAction"
- scope="prototype">
- <property name="mobileSettingService"
- ref="org.hisp.dhis.api.mobile.TrackedEntityMobileSettingService" />
- <property name="attributeService"
- ref="org.hisp.dhis.trackedentity.TrackedEntityAttributeService" />
- </bean>
-
- <bean id="org.hisp.dhis.mobile.action.UpdateMobileSettingAction"
- class="org.hisp.dhis.mobile.action.UpdateMobileSettingAction"
- scope="prototype">
- <property name="mobileSettingService"
- ref="org.hisp.dhis.api.mobile.TrackedEntityMobileSettingService" />
- <property name="attributeService"
- ref="org.hisp.dhis.trackedentity.TrackedEntityAttributeService" />
- </bean>
-
<!-- Mobile DataSet -->
<bean id="org.hisp.dhis.mobile.action.MobileDataSetListAction"
@@ -172,10 +152,8 @@
<bean id="org.hisp.dhis.mobile.action.J2meClientUpdateAction"
class="org.hisp.dhis.mobile.action.J2meClientUpdateAction"
- scope="prototype">
- <property name="mobileSettingService"
- ref="org.hisp.dhis.api.mobile.TrackedEntityMobileSettingService" />
- </bean>
+ scope="prototype"/>
+
<bean id="org.hisp.dhis.mobile.action.incoming.ProcessingSendQuickSMSAction"
class="org.hisp.dhis.mobile.action.incoming.ProcessingSendQuickSMSAction"
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/struts.xml 2013-12-13 07:04:37 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/struts.xml 2014-05-21 09:48:18 +0000
@@ -71,18 +71,6 @@
<param name="onExceptionReturn">plainTextError</param>
</action>
- <!-- Patient Mobile Setting Action -->
-
- <action name="patientMobileSetting" class="org.hisp.dhis.mobile.action.ShowMobileSettingFormAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-maintenance-mobile/patientSettings.vm</param>
- <param name="menu">/dhis-web-maintenance-mobile/menu.vm</param>
- </action>
-
- <action name="editPatientMobileSetting" class="org.hisp.dhis.mobile.action.UpdateMobileSettingAction">
- <result name="success" type="redirect">patientMobileSetting.action</result>
- </action>
-
<!-- Mobile Dataset Action -->
<action name="showMobileDataSet" class="org.hisp.dhis.mobile.action.MobileDataSetListAction">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/index.vm 2013-08-16 12:29:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/index.vm 2014-05-21 09:48:18 +0000
@@ -2,5 +2,4 @@
<ul class="introList">
#introListImgItem( "showMobileDataSet.action" "mobile_dataset" "mobile" )
- #introListImgItem( "patientMobileSetting.action" "patient_mobile_setting" "mobilesettings" )
</ul>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/menu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/menu.vm 2013-08-13 11:54:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/menu.vm 2014-05-21 09:48:18 +0000
@@ -1,7 +1,6 @@
<h2>DHIS Mobile Configuration</h2>
<ul>
<!--<li><a href = "mobileSettings.action">Settings</a></li>-->
- <li><a href="patientMobileSetting.action">$i18n.getString( "patient_mobile_setting" )</a></li>
<li><a href="showMobileDataSet.action">$i18n.getString( "mobile_dataset" ) </a></li>
<li><a href="showSMSConfigureForm.action">$i18n.getString( "sms_service_configuration" )</a></li>
<li><a href="showSentPage.action">$i18n.getString( "view_sent_sms" )</a></li>
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/patientSettings.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/patientSettings.vm 2012-05-30 08:49:09 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/patientSettings.vm 1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
-<script>
- jQuery(document).ready( function()
- {
- validation( 'editPatientMobileSetting', function( form ){ form.submit() }, function(){ selectAllById('selectedList') });
- });
-</script>
-<h3>$i18n.getString( "patient_mobile_setting" ) #openHelp( "patient_mobile_setting" )</h3>
-<form id="editPatientMobileSetting" name="editPatientMobileSetting" action="editPatientMobileSetting.action" method="post" >
- <table>
- <tr>
- <td>$i18n.getString( "gender" )</td>
- <td><input type="checkbox" id="gender" name="gender" value="true" #if( $setting.gender == 'true' ) checked #end/></td>
- </tr>
- <tr>
- <td>$i18n.getString( "dob_type" )</td>
- <td><input type="checkbox" id="dobtype" name="dobtype" value="true" #if( $setting.dobtype == 'true' ) checked #end/></td>
- </tr>
- <tr>
- <td>$i18n.getString( "date_of_birth" )</td>
- <td><input type="checkbox" id="birthdate" name="birthdate" value="true" #if( $setting.birthdate == 'true' ) checked #end/></td>
- </tr>
- <tr>
- <td>$i18n.getString( "registration_date" )</td>
- <td><input type="checkbox" id="registrationdate" name="registrationdate" value="true" #if( $setting.registrationdate == 'true' ) checked #end/></td>
- </tr>
- <tr>
- <td>$i18n.getString( "activity_grouping_attribute" )</td>
- <td>
- <select id="groupingAttributeId" name="groupingAttributeId">
- <option value="0">$i18n.getString( "please_select" )</option>
- #foreach( $att in $allAttributes )
- <option value="$att.id" #if($att.isGroupBy()) selected="selected" #end>$encoder.htmlEncode( $att.name )</option>
- #end
- </select>
- </td>
- </tr>
- </table>
- <br/>
- <table id="dataElementSelectionArea">
- <col/> ## Available DataElements
- <col/> ## Filter
- <col/> ## Selected DataElements
- <thead>
- <tr>
- <th>$i18n.getString( "available_patient_attributes" )</th>
- <th>$i18n.getString( "filter" )</th>
- <th>$i18n.getString( "selected_patient_attributes" )</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>
- <!-- List of all available PatientAttribute -->
- <select size="15" id="availableList" name="availableList" multiple="multiple" style="min-width:20em;height:20em" ondblclick="moveSelectedById( 'availableList', 'selectedList');">
- #foreach( $att in $attributes )
- <option value="$att.id">$encoder.htmlEncode( $att.name )</option>
- #end
- </select>
- </td>
- <td>
- <input type="button" value=">" title="$i18n.getString( 'move_selected' )" style="width:50px" onclick="moveSelectedById( 'availableList', 'selectedList');"/><br/>
- <input type="button" value="<" title="$i18n.getString( 'remove_selected' )" style="width:50px" onclick="moveSelectedById( 'selectedList', 'availableList');"/><br/>
- <input type="button" value=">>" title="$i18n.getString('move_all')" style="width:50px" onclick="moveAllById( 'availableList', 'selectedList' );"/><br/>
- <input type="button" value="<<" title="$i18n.getString('remove_all')" style="width:50px" onclick="moveAllById( 'selectedList', 'availableList' );"/>
- </td>
- <td>
- <!-- List of all selected PatientAttribute -->
- <select size="15" id="selectedList" name="selectedList" multiple="multiple" style="min-width:20em;height:20em" ondblclick="moveSelectedById( 'selectedList', 'availableList');">
- #foreach( $selectedAtt in $patientAtts )
- <option value="$selectedAtt.id">$encoder.htmlEncode( $selectedAtt.name )</option>
- #end
- </select>
- </td>
- <td style="width:30px; text-align:center">
- <a href="javascript:moveUpSelectedOption( 'selectedList' )"><img src="../images/move_up.png"/></a><br/><br/>
- <a href="javascript:moveDownSelectedOption( 'selectedList' )"><img src="../images/move_down.png"/></a><br/><br/>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- <input type="submit" value="$i18n.getString( 'save' )" style="width:20em"/>
- </td>
- </tr>
- </tbody>
- </table>
-</form>
