dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #32375
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16526: Remove the Allow enrollment in all orgunits from Program object
------------------------------------------------------------
revno: 16526
committer: Tran Chau<tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-08-26 19:43:04 +0700
message:
Remove the Allow enrollment in all orgunits from Program object
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStore.java
dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/hibernate/HibernateCaseAggregationConditionStore.java
dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramService.java
dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStore.java
dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java
dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/hibernate/Program.hbm.xml
dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStoreTest.java
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgram.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/program/AddProgramAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/program/UpdateProgramAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/program.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programList.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramForm.vm
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java 2014-08-15 07:40:20 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java 2014-08-26 12:43:04 +0000
@@ -103,12 +103,6 @@
@Scanned
private Set<TrackedEntityInstanceReminder> instanceReminders = new HashSet<>();
- /**
- * Allow enrolling tracked entity to all org units disregarding whether the
- * program is assigned for the org unit or not.
- */
- private Boolean displayOnAllOrgunit = true;
-
private Boolean selectEnrollmentDatesInFuture = false;
private Boolean selectIncidentDatesInFuture = false;
@@ -424,19 +418,6 @@
@JsonProperty
@JsonView( { DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class } )
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
- public Boolean getDisplayOnAllOrgunit()
- {
- return displayOnAllOrgunit;
- }
-
- public void setDisplayOnAllOrgunit( Boolean displayOnAllOrgunit )
- {
- this.displayOnAllOrgunit = displayOnAllOrgunit;
- }
-
- @JsonProperty
- @JsonView( { DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class } )
- @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public Boolean getSelectEnrollmentDatesInFuture()
{
return selectEnrollmentDatesInFuture;
@@ -571,7 +552,6 @@
displayIncidentDate = program.getDisplayIncidentDate();
ignoreOverdueEvents = program.getIgnoreOverdueEvents();
onlyEnrollOnce = program.getOnlyEnrollOnce();
- displayOnAllOrgunit = program.getDisplayOnAllOrgunit();
selectEnrollmentDatesInFuture = program.getSelectEnrollmentDatesInFuture();
selectIncidentDatesInFuture = program.getSelectIncidentDatesInFuture();
relationshipText = program.getRelationshipText();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStore.java 2014-05-23 15:28:46 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStore.java 2014-08-26 12:43:04 +0000
@@ -88,19 +88,7 @@
* @return Program list by a type specified
*/
Collection<Program> getByCurrentUser( int type );
-
- /**
- * Get {@link Program} which are displayed on all {@link OrganisationUnit}
- * for searching or enrolling a person
- *
- * @param displayOnAllOrgunit Optional flag to specify programs can
- * displayed for searching or enrolling (<code>true</code> ) or
- * cannot be used on the orgunit (<code>false</code>) instances.
- * @param orgunit {@link OrganisationUnit}
- * @return Program list
- */
- Collection<Program> getProgramsByDisplayOnAllOrgunit( boolean displayOnAllOrgunit, OrganisationUnit orgunit );
-
+
/**
* Get {@link Program} by TrackedEntity
*
=== modified file 'dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/hibernate/HibernateCaseAggregationConditionStore.java'
--- dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/hibernate/HibernateCaseAggregationConditionStore.java 2014-08-24 12:31:24 +0000
+++ dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/hibernate/HibernateCaseAggregationConditionStore.java 2014-08-26 12:43:04 +0000
@@ -1101,11 +1101,11 @@
{
periodid = rs.getInt( "periodid" );
}
-
+
if ( periodid == null )
{
- String insertSql = "insert into period (periodtypeid,startdate,enddate) " + " VALUES " + "("
- + periodTypeId + ",'" + start + "','" + end + "' )";
+ String insertSql = "insert into period (periodid, periodtypeid,startdate,enddate) " + " VALUES " + "("
+ + statementBuilder.getAutoIncrementValue() +"," + periodTypeId + ",'" + start + "','" + end + "' )";
jdbcTemplate.execute( insertSql );
period.setId( jdbcTemplate.queryForObject( sql, Integer.class ) );
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramService.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramService.java 2014-08-15 07:40:20 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramService.java 2014-08-26 12:43:04 +0000
@@ -162,8 +162,7 @@
@Override
public Collection<Program> getProgramsByCurrentUser( OrganisationUnit organisationUnit )
{
- Collection<Program> programs = new ArrayList<>( getProgramsByDisplayOnAllOrgunit( true, null ) );
- programs.addAll( getProgramsByDisplayOnAllOrgunit( false, organisationUnit ) );
+ Collection<Program> programs = new ArrayList<>( getPrograms( organisationUnit ) );
programs.retainAll( getProgramsByCurrentUser() );
return programs;
@@ -198,14 +197,5 @@
{
return i18n( i18nService, programStore.getAllOrderedName( min, max ) );
}
-
- // -------------------------------------------------------------------------
- // Supportive methods
- // -------------------------------------------------------------------------
-
- private Collection<Program> getProgramsByDisplayOnAllOrgunit( boolean displayOnAllOrgunit, OrganisationUnit orgunit )
- {
- return i18n( i18nService, programStore.getProgramsByDisplayOnAllOrgunit( displayOnAllOrgunit, orgunit ) );
- }
}
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStore.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStore.java 2014-08-15 07:40:20 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStore.java 2014-08-26 12:43:04 +0000
@@ -155,21 +155,6 @@
@Override
@SuppressWarnings( "unchecked" )
- public Collection<Program> getProgramsByDisplayOnAllOrgunit( boolean displayOnAllOrgunit, OrganisationUnit orgunit )
- {
- Criteria criteria = getCriteria();
- criteria.add( Restrictions.eq( "displayOnAllOrgunit", displayOnAllOrgunit ) );
- if ( orgunit != null )
- {
- criteria.createAlias( "organisationUnits", "orgunit" );
- criteria.add( Restrictions.eq( "orgunit.id", orgunit.getId() ) );
- }
-
- return criteria.list();
- }
-
- @Override
- @SuppressWarnings( "unchecked" )
public Collection<Program> getByTrackedEntity( TrackedEntity trackedEntity )
{
return getCriteria( Restrictions.eq( "trackedEntity", trackedEntity ) ).list();
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java 2014-08-07 13:57:44 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java 2014-08-26 12:43:04 +0000
@@ -299,6 +299,8 @@
updateProgramStageList();
updateProgramAttributeList();
+
+ executeSql( "ALTER TABLE program DROP COLUMN displayonallorgunit" );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/hibernate/Program.hbm.xml'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/hibernate/Program.hbm.xml 2014-08-21 10:12:43 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/program/hibernate/Program.hbm.xml 2014-08-26 12:43:04 +0000
@@ -68,8 +68,6 @@
<one-to-many class="org.hisp.dhis.trackedentity.TrackedEntityInstanceReminder" />
</set>
- <property name="displayOnAllOrgunit" />
-
<property name="selectEnrollmentDatesInFuture" />
<property name="selectIncidentDatesInFuture" />
=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStoreTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStoreTest.java 2014-07-26 14:38:39 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStoreTest.java 2014-08-26 12:43:04 +0000
@@ -28,7 +28,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
@@ -113,25 +112,4 @@
Collection<Program> programs = programStore.get( Program.MULTIPLE_EVENTS_WITH_REGISTRATION, organisationUnitA );
assertTrue( equals( programs, programA, programB ) );
}
-
- @Test
- public void testGetProgramsByDisplayOnAllOrgunit()
- {
- programA.setDisplayOnAllOrgunit( true );
- programB.setDisplayOnAllOrgunit( true );
- programC.setDisplayOnAllOrgunit( false );
-
- programStore.save( programA );
- programStore.save( programB );
- programStore.save( programC );
-
- Collection<Program> programs = programStore.getProgramsByDisplayOnAllOrgunit( true, organisationUnitA );
- assertEquals( 2, programs.size() );
- assertTrue( programs.contains( programA ) );
- assertTrue( programs.contains( programB ) );
-
- programs = programStore.getProgramsByDisplayOnAllOrgunit( false, organisationUnitB );
- assertEquals( 1, programs.size() );
- assertTrue( programs.contains( programC ) );
- }
}
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgram.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgram.vm 2014-07-13 07:53:57 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgram.vm 2014-08-26 12:43:04 +0000
@@ -13,7 +13,6 @@
"programStageCount": "${program.programStages.size()}",
"noAttributes": "$!program.attributes.size()",
"onlyEnrollOnce": "$!program.onlyEnrollOnce",
- "displayOnAllOrgunit": "$!program.displayOnAllOrgunit",
"selectEnrollmentDatesInFuture": "$!program.selectEnrollmentDatesInFuture",
"selectIncidentDatesInFuture": "$!program.selectIncidentDatesInFuture"
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/program/AddProgramAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/program/AddProgramAction.java 2014-08-15 07:40:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/program/AddProgramAction.java 2014-08-26 12:43:04 +0000
@@ -191,13 +191,6 @@
this.onlyEnrollOnce = onlyEnrollOnce;
}
- private Boolean displayOnAllOrgunit;
-
- public void setDisplayOnAllOrgunit( Boolean displayOnAllOrgunit )
- {
- this.displayOnAllOrgunit = displayOnAllOrgunit;
- }
-
private Boolean selectEnrollmentDatesInFuture;
public void setSelectEnrollmentDatesInFuture( Boolean selectEnrollmentDatesInFuture )
@@ -264,7 +257,6 @@
displayIncidentDate = (displayIncidentDate == null) ? false : displayIncidentDate;
ignoreOverdueEvents = (ignoreOverdueEvents == null) ? false : ignoreOverdueEvents;
onlyEnrollOnce = (onlyEnrollOnce == null) ? false : onlyEnrollOnce;
- displayOnAllOrgunit = (displayOnAllOrgunit == null) ? false : displayOnAllOrgunit;
selectEnrollmentDatesInFuture = (selectEnrollmentDatesInFuture == null) ? false : selectEnrollmentDatesInFuture;
selectIncidentDatesInFuture = (selectIncidentDatesInFuture == null) ? false : selectIncidentDatesInFuture;
dataEntryMethod = (dataEntryMethod == null) ? false : dataEntryMethod;
@@ -279,7 +271,6 @@
program.setType( type );
program.setDisplayIncidentDate( displayIncidentDate );
program.setOnlyEnrollOnce( onlyEnrollOnce );
- program.setDisplayOnAllOrgunit( displayOnAllOrgunit );
program.setSelectEnrollmentDatesInFuture( selectEnrollmentDatesInFuture );
program.setSelectIncidentDatesInFuture( selectIncidentDatesInFuture );
program.setDataEntryMethod( dataEntryMethod );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/program/UpdateProgramAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/program/UpdateProgramAction.java 2014-08-15 07:40:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/program/UpdateProgramAction.java 2014-08-26 12:43:04 +0000
@@ -196,13 +196,6 @@
this.remindCompleted = remindCompleted;
}
- private Boolean displayOnAllOrgunit;
-
- public void setDisplayOnAllOrgunit( Boolean displayOnAllOrgunit )
- {
- this.displayOnAllOrgunit = displayOnAllOrgunit;
- }
-
private Boolean selectEnrollmentDatesInFuture;
public void setSelectEnrollmentDatesInFuture( Boolean selectEnrollmentDatesInFuture )
@@ -279,7 +272,6 @@
ignoreOverdueEvents = (ignoreOverdueEvents == null) ? false : ignoreOverdueEvents;
blockEntryForm = (blockEntryForm == null) ? false : blockEntryForm;
remindCompleted = (remindCompleted == null) ? false : remindCompleted;
- displayOnAllOrgunit = (displayOnAllOrgunit == null) ? false : displayOnAllOrgunit;
selectEnrollmentDatesInFuture = (selectEnrollmentDatesInFuture == null) ? false : selectEnrollmentDatesInFuture;
selectIncidentDatesInFuture = (selectIncidentDatesInFuture == null) ? false : selectIncidentDatesInFuture;
dataEntryMethod = (dataEntryMethod == null) ? false : dataEntryMethod;
@@ -292,7 +284,6 @@
program.setType( type );
program.setDisplayIncidentDate( displayIncidentDate );
program.setOnlyEnrollOnce( onlyEnrollOnce );
- program.setDisplayOnAllOrgunit( displayOnAllOrgunit );
program.setSelectEnrollmentDatesInFuture( selectEnrollmentDatesInFuture );
program.setSelectIncidentDatesInFuture( selectIncidentDatesInFuture );
program.setDataEntryMethod( dataEntryMethod );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramForm.vm 2014-08-06 15:20:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramForm.vm 2014-08-26 12:43:04 +0000
@@ -158,13 +158,7 @@
<td><input type="text" id="dateOfEnrollmentDescription" name="dateOfEnrollmentDescription" value="$i18n.getString('enrollment_date')"></td>
<td></td>
</tr>
-
- <tr name='nonAnonymous'>
- <td><label for="displayOnAllOrgunit">$i18n.getString( "allow_enrollment_at_all_orgunits" )</label></td>
- <td><input type="checkbox" id="displayOnAllOrgunit" name="displayOnAllOrgunit" value='true'></td>
- <td></td>
- </tr>
-
+
<tr name='nonAnonymous'><td> </td></tr>
<tr name='nonAnonymous'>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/program.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/program.js 2014-06-22 11:20:48 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/program.js 2014-08-26 12:43:04 +0000
@@ -65,9 +65,6 @@
var onlyEnrollOnce = ( json.program.onlyEnrollOnce == 'true') ? i18n_yes : i18n_no;
setInnerHTML('onlyEnrollOnceField', onlyEnrollOnce);
- var displayOnAllOrgunit = ( json.program.displayOnAllOrgunit == 'true') ? i18n_yes : i18n_no;
- setInnerHTML('displayOnAllOrgunitField', displayOnAllOrgunit);
-
var selectEnrollmentDatesInFuture = ( json.program.selectEnrollmentDatesInFuture == 'true') ? i18n_yes : i18n_no;
setInnerHTML('selectEnrollmentDatesInFutureField', selectEnrollmentDatesInFuture);
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programList.vm 2014-08-03 16:27:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programList.vm 2014-08-26 12:43:04 +0000
@@ -73,7 +73,6 @@
<p><label class="bold">$i18n.getString( "allow_select_incident_date_in_future" ):</label><br><span id="selectIncidentDatesInFutureField"></span></p>
<p><label class="bold">$i18n.getString( "skip_to_generate_overdue_events" ):</label><br><span id="ignoreOverdueEventsField"></span></p>
<p><label class="bold">$i18n.getString( "only_enroll_once" ):</label><br><span id="onlyEnrollOnceField"></span></p>
- <p><label class="bold">$i18n.getString( "allow_enrollment_at_all_orgunits" ):</label><br><span id="displayOnAllOrgunitField"></span></p>
<p><label class="bold">$i18n.getString( "show_incident_date" ):</label><br><span id="displayIncidentDate"></span></p>
<p><label class="bold">$i18n.getString( "date_of_incident_description" ):</label><br><span id="dateOfIncidentDescriptionField"></span></p>
<p><label class="bold">$i18n.getString( "date_of_enrollment_description" ):</label><br><span id="dateOfEnrollmentDescriptionField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramForm.vm 2014-08-06 15:20:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramForm.vm 2014-08-26 12:43:04 +0000
@@ -167,12 +167,6 @@
<td><input type="text" id="dateOfEnrollmentDescription" name="dateOfEnrollmentDescription" value="$!program.dateOfEnrollmentDescription" class="{validate:{required:true,minlength:4}}" #if( $program.type=='3' ) disabled #end></td>
<td></td>
</tr>
-
- <tr name='nonAnonymous'>
- <td><label for="displayOnAllOrgunit">$i18n.getString( "allow_enrollment_at_all_orgunits" )</label></td>
- <td><input type="checkbox" id="displayOnAllOrgunit" name="displayOnAllOrgunit" value='true' #if($program.displayOnAllOrgunit) checked #end></td>
- <td></td>
- </tr>
<tr name='nonAnonymous'><td> </td></tr>
