dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #30597
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 15547: Remove unused classes in tracker module.
------------------------------------------------------------
revno: 15547
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-06-04 17:39:16 +0800
message:
Remove unused classes in tracker module.
removed:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/program/ShowProgramUserroleFormAction.java
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programUserrole.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateSingleProgramValidationForm.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-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/program/ShowProgramUserroleFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/program/ShowProgramUserroleFormAction.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/program/ShowProgramUserroleFormAction.java 1970-01-01 00:00:00 +0000
@@ -1,106 +0,0 @@
-package org.hisp.dhis.trackedentity.action.program;
-
-/*
- * 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.program.Program;
-import org.hisp.dhis.program.ProgramService;
-import org.hisp.dhis.user.UserAuthorityGroup;
-import org.hisp.dhis.user.UserService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Chau Thu Tran
- *
- * @version ShowProgramUserroleFormAction.java 12:44:19 PM Feb 19, 2013 $
- */
-public class ShowProgramUserroleFormAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private UserService userService;
-
- public void setUserService( UserService userService )
- {
- this.userService = userService;
- }
-
- private ProgramService programService;
-
- public void setProgramService( ProgramService programService )
- {
- this.programService = programService;
- }
-
- // -------------------------------------------------------------------------
- // Input/output
- // -------------------------------------------------------------------------
-
- private Integer id;
-
- public void setId( Integer id )
- {
- this.id = id;
- }
-
- private Collection<UserAuthorityGroup> userRoles;
-
- public Collection<UserAuthorityGroup> getUserRoles()
- {
- return userRoles;
- }
-
- private Program program;
-
- public Program getProgram()
- {
- return program;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- @Override
- public String execute()
- {
- program = programService.getProgram( id );
-
- userRoles = userService.getAllUserAuthorityGroups();
- userRoles.removeAll( program.getUserRoles() );
-
- return SUCCESS;
- }
-
-}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/META-INF/dhis/beans.xml 2014-05-16 08:12:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/META-INF/dhis/beans.xml 2014-06-04 09:39:16 +0000
@@ -252,14 +252,6 @@
</bean>
<bean
- id="org.hisp.dhis.trackedentity.action.program.ShowProgramUserroleFormAction"
- class="org.hisp.dhis.trackedentity.action.program.ShowProgramUserroleFormAction"
- scope="prototype">
- <property name="userService" ref="org.hisp.dhis.user.UserService" />
- <property name="programService" ref="org.hisp.dhis.program.ProgramService" />
- </bean>
-
- <bean
id="org.hisp.dhis.trackedentity.action.program.DefineProgramUserroleAction"
class="org.hisp.dhis.trackedentity.action.program.DefineProgramUserroleAction"
scope="prototype">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/struts.xml 2014-05-04 14:04:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/struts.xml 2014-06-04 09:39:16 +0000
@@ -252,7 +252,7 @@
</action>
<action name="showProgramUserroleForm"
- class="org.hisp.dhis.trackedentity.action.program.ShowProgramUserroleFormAction">
+ class="org.hisp.dhis.trackedentity.action.program.GetProgramAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-program/programUserrole.vm</param>
<param name="javascripts">javascript/program.js</param>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programUserrole.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programUserrole.vm 2014-06-03 05:44:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programUserrole.vm 2014-06-04 09:39:16 +0000
@@ -17,11 +17,8 @@
</tr>
<tr>
<td>
- <select style="height:200px;width:100%;" size="15" id="availableList" name="availableList" multiple="multiple" style="min-width:20em;height:20em" ondblclick="moveSelectedById( 'availableList', 'userRoleIds' )">
- #foreach ( $userRole in $userRoles )
- <option value="$userRole.id">$encoder.htmlEncode( $userRole.name )</option>
- #end
- </select>
+ <select style="height:200px;width:100%;" size="15" id="availableList" name="availableList" multiple="multiple" style="min-width:20em;height:20em" ondblclick="moveSelectedById( 'availableList', 'userRoleIds' )">
+ </select>
</td>
<td>
<input type="button" value=">" onclick="moveSelectedById( 'availableList', 'userRoleIds' )" class="filterButton" /><br/>
@@ -47,5 +44,18 @@
$(document).ready(function(){
sortList('availableList', 'ASC');
sortList('selectedList', 'ASC');
+
+ jQuery("#availableList").dhisAjaxSelect({
+ source: '../dhis-web-commons-ajax-json/getUserRoles.action',
+ iterator: 'userRoles',
+ connectedTo: 'selectedList',
+ handler: function(item){
+ var option = jQuery( "<option/>" );
+ option.attr( "value", item.id );
+ option.text( item.name );
+
+ return option;
+ }
+ });
});
</script>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateSingleProgramValidationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateSingleProgramValidationForm.vm 2014-04-29 11:29:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateSingleProgramValidationForm.vm 2014-06-04 09:39:16 +0000
@@ -55,8 +55,8 @@
<tr>
<td></td>
<td>
- <input type='submit' value="$i18n.getString( 'save' )" >
- <input type='button' value="$i18n.getString( 'cancel' )" onclick="window.location.href='programValidation.action?programId=$program.id'">
+ <input type='submit' value="$i18n.getString( 'save' )" style="width:10em">
+ <input type='button' value="$i18n.getString( 'cancel' )" onclick="window.location.href='programValidation.action?programId=$program.id'" style="width:10em">
</td>
</tr>
</table>
