dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #29184
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 14706: Remove Multiple entry form in Individual records.
------------------------------------------------------------
revno: 14706
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-04-07 01:03:57 +0700
message:
Remove Multiple entry form in Individual records.
removed:
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/multiDataEntry.js
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/multiDataEntrySelect.vm
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties
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/dataEntryMenu.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/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
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2014-04-04 17:58:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2014-04-06 18:03:57 +0000
@@ -57,7 +57,6 @@
error_required_field=Please enter value for all data element in red color
complete=Complete
dataset_list=Data set list
-multiple_individual_records=Multiple Individual Records
manual_tracked_entity_instance_aggregation=Manual Aggregation
manual_tracked_entity_instance_aggregation_form=Manual aggregation
intro_manual_tracked_entity_instance_aggregation=Generate routine data values from tracked entity instance data by month (or other intervals if desired) and organisation unit.
@@ -84,7 +83,6 @@
please_select_to_date_greater_or_equals_to_from_date=Please select to-date later or equal to from-date
violate_validation=Violating validation
dob_type=DOB type
-intro_multiple_individual_records=Enter data for multiple program stages and tracked entity instances for a program, and get an overview of the stage status.
is_null=is null
data_value=data value
successful_validation=The data entry screen successfully passed validation
=== 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 2014-03-20 10:17:37 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml 2014-04-06 18:03:57 +0000
@@ -293,24 +293,6 @@
<!-- Multi DataEntry -->
- <action name="multipledataEntrySelect"
- class="org.hisp.dhis.caseentry.action.caseentry.MultiDataEntrySelectAction">
- <interceptor-ref name="organisationUnitTreeStack" />
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-caseentry/multiDataEntrySelect.vm</param>
- <param name="menu">/dhis-web-caseentry/dataEntryMenu.vm</param>
- <param name="stylesheets">style/style.css</param>
- <param name="javascripts">
- ../dhis-web-commons/ouwt/ouwt.js,
- javascript/commons.js,
- javascript/trackedEntityInstance.js,
- javascript/entry.js,
- javascript/relationshipTrackedEntityInstance.js,
- javascript/multiDataEntry.js
- </param>
- <param name="requiredAuthorities">F_NAME_BASED_DATA_ENTRY</param>
- </action>
-
<action name="getPrograms"
class="org.hisp.dhis.caseentry.action.caseentry.GetProgramsByOrgunitAction">
<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonPrograms.vm
@@ -323,13 +305,6 @@
</result>
</action>
- <action name="getDataRecords"
- class="org.hisp.dhis.caseentry.action.caseentry.GetDataRecordsAction">
- <result name="success" type="velocity">/content.vm</result>
- <param name="page">/dhis-web-caseentry/dataentryRecords.vm</param>
- <param name="stylesheets">style/style.css</param>
- </action>
-
<action name="viewProgramStageRecords"
class="org.hisp.dhis.caseentry.action.caseentry.LoadDataEntryAction">
<result name="success" type="velocity">/content.vm</result>
@@ -337,22 +312,6 @@
<param name="stylesheets">style/style.css</param>
</action>
- <action name="loadProgramStageRecords"
- class="org.hisp.dhis.caseentry.action.caseentry.LoadDataEntryAction">
- <result name="success" type="velocity">/content.vm</result>
- <param name="page">/dhis-web-caseentry/dataEntryForm.vm</param>
- <param name="javascripts">../dhis-web-commons/javascripts/date.js</param>
- <param name="requiredAuthorities">F_TRACKED_ENTITY_DATAVALUE_ADD,F_TRACKED_ENTITY_DATAVALUE_DELETE</param>
- </action>
-
- <action name="completeProgramStageDataEntry"
- class="org.hisp.dhis.caseentry.action.caseentry.CompleteDataEntryAction">
- <result name="success" type="redirect">
- getDataRecords.action?programId=${programId}
- </result>
- <param name="requiredAuthorities">F_TRACKED_ENTITY_DATAVALUE_ADD,F_TRACKED_ENTITY_DATAVALUE_DELETE</param>
- </action>
-
<!-- Single-event DataEntry -->
<action name="singleEventSelect"
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryMenu.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryMenu.vm 2013-01-29 15:19:42 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryMenu.vm 2014-04-06 18:03:57 +0000
@@ -1,9 +1,6 @@
<a href="index.action"><h2>$i18n.getString( "data_entry" ) </h2></a>
<div id="dataEntryMenu">
<ul>
- #if( $auth.hasAccess( "dhis-web-caseentry", "multipledataEntrySelect" ) )
- <li><a href="multipledataEntrySelect.action">$i18n.getString( "multiple_individual_records" ) </a></li>
- #end
#if( $auth.hasAccess( "dhis-web-caseentry", "singleEventSelect" ) )
<li><a href="singleEventSelect.action">$i18n.getString( "single_event_with_registration" )</a></li>
#end
=== removed file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm 2014-04-04 17:58:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm 1970-01-01 00:00:00 +0000
@@ -1,97 +0,0 @@
-<script src="javascript/tooltip.js" type="text/javascript"></script>
-<table>
- <tr>
- <td class='text-column' >$i18n.getString( "search_result_matching_the_search_criteria" ):</td>
- <td> </td>
- <td> </td>
- <td id='searchInforLbl'>
- #if($!listAll)
- $i18n.getString( "list_all_tracked_entity_instances" )
- #else
- $i18n.getString( "search_tracked_entity_instances" )
- #end
- </td>
- </tr>
-
- <tr>
- <td class='text-column'>$i18n.getString( "total_result" ):</td>
- <td> </td>
- <td> </td>
- <td id='totalTd'>$!total</td>
- </tr>
-</table>
-
-#if( $programStageInstances && $programStageInstances.size()>0 )
-
-<table class='listTable gridTable'>
- <thead>
- <tr>
- <th>#</th>
- <th>$i18n.getString('date_scheduled')</th>
- #foreach( $programAttribute in $program.programAttributes )
- #if($programAttribute.displayInList=='true')
- $programAttribute.attribute.displayName
- #end
- #end
- <th>$i18n.getString( "events" )</th>
- <th>$i18n.getString( "operations" )</th>
- </tr>
- </thead>
- <tbody id="list">
- #set( $mark = false )
- #foreach( $programStageInstance in $programStageInstances )
- #set($entityInstance = $programStageInstance.programInstance.entityInstance)
- <tr id='tr$programStageInstance.id' #alternate( $mark )>
- <td>
- #set( $nr = ( ( $paging.getCurrentPage() - 1 ) * $paging.pageSize ) + $velocityCount )
- $nr
- </td>
-
- <td>
- #if($!programStageInstance.executionDate)
- $format.formatDate($!programStageInstance.executionDate)
- #else
- $format.formatDate($!programStageInstance.dueDate)
- #end
- </td>
-
- #if( $auth.hasAccess( "dhis-web-caseentry", "accessAttributes" ) )
- #foreach( $programAttribute in $program.programAttributes )
- #if($programAttribute.displayInList=='true')
- <td><a href="javascript:isDashboard=false;showTrackedEntityInstanceDashboardForm( '$entityInstance.uid' )">
- #foreach( $attributeValue in $entityInstance.attributeValues)
- #if($!attributeValue.attribute.id==$programAttribute.attribute.id)
- #set($value=$attributeValue.value)
- #if( $programAttribute.attribute.valueType == 'bool')
- #set($value=$i18n.getString($attributeValue.value))
- #end
- #end
- #end
-
- $encoder.htmlEncode($value)
- </td>
- #end
- #end
- #end
-
- <td><a href="javascript:loadDataEntryDialog( $programStageInstance.id );">$programStageInstance.programStage.displayName</a></td>
-
- <td>
- <a href="javascript:isDashboard=false;showTrackedEntityInstanceDashboardForm( '$entityInstance.uid' )" title="$i18n.getString( 'dashboard' )"><img src="../images/enroll.png" alt='$i18n.getString( "dashboard" )'></a>
- <a href="javascript:loadDataEntryDialog( $programStageInstance.id );" title="$i18n.getString( 'data_entry' )"><img src="images/data_entry.png" alt="$i18n.getString( 'data_entry' )"></a>
- <a href="javascript:showTrackedEntityInstanceHistory('$entityInstance.uid')" title='$i18n.getString( "tracked_entity_instance_details_and_history" )'><img src="../images/information.png" alt='$i18n.getString( "tracked_entity_instance_details_and_history" )'></a>
- </td>
-
- </tr>
- #set( $mark = !$mark )
- #end
- </tbody>
-</table>
-
-<div class="paging-container">
- #parse( "/dhis-web-commons/paging/paging.vm" )
-</div>
-
-<div id="detailsInfo"></div>
-
-#end
=== removed file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.vm 2014-02-07 20:25:49 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.vm 1970-01-01 00:00:00 +0000
@@ -1,210 +0,0 @@
-TR.i18n = {
-title:'$encoder.jsEscape($i18n.getString( 'title' ) , "'")',
-program: '$encoder.jsEscape($i18n.getString( 'program' ) , "'")',
-identifiers_and_attributes:'$encoder.jsEscape($i18n.getString( 'identifiers_and_attributes' ) , "'")',
-identifiers:'$encoder.jsEscape($i18n.getString( 'identifiers' ) , "'")',
-attributes:'$encoder.jsEscape($i18n.getString( 'attributes' ) , "'")',
-start_date:'$encoder.jsEscape($i18n.getString( 'start_date' ) , "'")',
-end_date:'$encoder.jsEscape($i18n.getString( 'end_date' ) , "'")',
-et_no_program:'$encoder.jsEscape($i18n.getString( 'et_no_program' ) , "'")',
-em_no_data_element:'$encoder.jsEscape($i18n.getString( 'em_no_data_element' ) , "'")',
-data_elements:'$encoder.jsEscape($i18n.getString( 'data_elements' ) , "'")',
-program_stage:'$encoder.jsEscape($i18n.getString( 'program_stage' ) , "'")',
-please_select:'[' + '$encoder.jsEscape($i18n.getString( 'please_select' ) , "'")' + ']',
-all_attribute_groups:'$encoder.jsEscape($i18n.getString( 'all_attribute_groups' ) , "'")',
-format_date: 'Y-m-d',
-use_data_from_level:'$encoder.jsEscape($i18n.getString( 'use_data_from_level' ) , "'")',
-use_data_from_level:'$encoder.jsEscape($i18n.getString( 'use_data_from_level' ) , "'")',
-all: '$encoder.jsEscape($i18n.getString( 'all' ) , "'")',
-children_only: '$encoder.jsEscape($i18n.getString( 'children_only' ) , "'")',
-available: '$encoder.jsEscape($i18n.getString( 'available' ) , "'")',
-selected: '$encoder.jsEscape($i18n.getString( 'selected' ) , "'")',
-show_hierachy_from_level: '$encoder.jsEscape($i18n.getString( 'show_hierachy_from_level' ) , "'")',
-report_unit: '$encoder.jsEscape($i18n.getString( 'report_unit' ) , "'")',
-report_date: '$encoder.jsEscape($i18n.getString( 'report_date' ) , "'")',
-et_no_dataelement:'$encoder.jsEscape($i18n.getString( 'et_no_dataelement' ) , "'")',
-download:'$encoder.jsEscape($i18n.getString( 'download' ) , "'")',
-filter:'$encoder.jsEscape($i18n.getString( 'filter' ) , "'")',
-cancel:'$encoder.jsEscape($i18n.getString( 'cancel' ) , "'")',
-clear:'$encoder.jsEscape($i18n.getString( 'clear' ) , "'")',
-clear_filter:'$encoder.jsEscape($i18n.getString( 'clear_filter' ) , "'")',
-show_hide_settings:'$encoder.jsEscape($i18n.getString( 'show_hide_settings' ) , "'")',
-updating:'$encoder.jsEscape($i18n.getString( 'updating' ) , "'")',
-data_table:'$encoder.jsEscape($i18n.getString( 'data_table' ) , "'")',
-page:'$encoder.jsEscape($i18n.getString( 'page' ) , "'")',
-loading:'$encoder.jsEscape($i18n.getString( 'loading' ) , "'")',
-update:'$encoder.jsEscape($i18n.getString( 'update' ) , "'")',
-et_no_data:'$encoder.jsEscape($i18n.getString( 'et_no_data' ) , "'")',
-em_no_orgunits:'$encoder.jsEscape($i18n.getString( 'em_no_orgunits' ) , "'")',
-organisation_units:'$encoder.jsEscape($i18n.getString( 'organisation_units' ) , "'")',
-commons:'$encoder.jsEscape($i18n.getString( 'commons' ) , "'")',
-options:'$encoder.jsEscape($i18n.getString( 'options' ) , "'")',
-reset:'$encoder.jsEscape($i18n.getString( 'reset' ) , "'")',
-no:'$encoder.jsEscape($i18n.getString( 'no' ) , "'")',
-report:'$encoder.jsEscape($i18n.getString( 'report' ) , "'")',
-demographics:'$encoder.jsEscape($i18n.getString( 'demographics' ) , "'")',
-asc:'$encoder.jsEscape($i18n.getString( 'asc' ) , "'")',
-desc:'$encoder.jsEscape($i18n.getString( 'desc' ) , "'")',
-show_hide_columns:'$encoder.jsEscape($i18n.getString( 'show_hide_columns' ) , "'")',
-favorites:'$encoder.jsEscape($i18n.getString( 'favorites' ) , "'")',
-manage_favorites:'$encoder.jsEscape($i18n.getString( 'manage_favorites' ) , "'")',
-sort_by:'$encoder.jsEscape($i18n.getString( 'sort_by' ) , "'")',
-name:'$encoder.jsEscape($i18n.getString( 'name' ) , "'")',
-last_updated:'$encoder.jsEscape($i18n.getString( 'last_updated' ) , "'")',
-rename:'$encoder.jsEscape($i18n.getString( 'rename' ) , "'")',
-rename_favorite:'$encoder.jsEscape($i18n.getString( 'rename_favorite' ) , "'")',
-delete_object:'$encoder.jsEscape($i18n.getString( 'delete_object' ) , "'")',
-delete_favorite:'$encoder.jsEscape($i18n.getString( 'delete_favorite' ) , "'")',
-are_you_sure:'$encoder.jsEscape($i18n.getString( 'are_you_sure' ) , "'")',
-save:'$encoder.jsEscape($i18n.getString( 'save' ) , "'")',
-save_favorite:'$encoder.jsEscape($i18n.getString( 'save_favorite' ) , "'")',
-overwrite:'$encoder.jsEscape($i18n.getString( 'overwrite' ) , "'")',
-et_no_programs: '$encoder.jsEscape($i18n.getString( 'et_no_programs' ) , "'")',
-favorites:'$encoder.jsEscape($i18n.getString( 'favorites' ) , "'")',
-name_already_in_use: '$encoder.jsEscape($i18n.getString( 'name_already_in_use' ) , "'")',
-view: '$encoder.jsEscape($i18n.getString( 'view' ) , "'")',
-confirmation:'$encoder.jsEscape($i18n.getString( 'confirmation' ) , "'")',
-data_entry_form:'$encoder.jsEscape($i18n.getString( 'data_entry_form' ) , "'")',
-start_date_must_be_less_then_or_equals_to_end_date:'$encoder.jsEscape($i18n.getString( 'start_date_must_be_less_then_or_equals_to_end_date' ) , "'")',
-is_not_valid:'$encoder.jsEscape($i18n.getString( 'is_not_valid' ) , "'")',
-the_date_is_not_valid:'$encoder.jsEscape($i18n.getString( 'the_date_is_not_valid' ) , "'")',
-before:'$encoder.jsEscape($i18n.getString( 'before' ) , "'")',
-after:'$encoder.jsEscape($i18n.getString( 'after' ) , "'")',
-on:'$encoder.jsEscape($i18n.getString( 'on' ) , "'")',
-orgunit_groups:'$encoder.jsEscape($i18n.getString( 'orgunit_groups' ) , "'")',
-none:'[' + '$encoder.jsEscape($i18n.getString( 'none' ) , "'")' + ']',
-not_empty:'$encoder.jsEscape($i18n.getString( 'not_empty' ) , "'")',
-operations:'$encoder.jsEscape($i18n.getString( 'operations' ) , "'")',
-deleting:'$encoder.jsEscape($i18n.getString( 'deleting' ) , "'")',
-saving:'$encoder.jsEscape($i18n.getString( 'saving' ) , "'")',
-renaming:'$encoder.jsEscape($i18n.getString( 'renaming' ) , "'")',
-yes:'$encoder.jsEscape($i18n.getString( 'yes' ) , "'")',
-no:'$encoder.jsEscape($i18n.getString( 'no' ) , "'")',
-value_is_invalid:'$encoder.jsEscape($i18n.getString( 'value_is_invalid' ) , "'")',
-value_is_valid:'$encoder.jsEscape($i18n.getString( 'value_is_valid' ) , "'")',
-em_no_program_stage: '$encoder.jsEscape($i18n.getString( 'em_no_program_stage' ) , "'")',
-error: '$encoder.jsEscape($i18n.getString( 'error' ) , "'")',
-events: '$encoder.jsEscape($i18n.getString( 'events' ) , "'")',
-report_type: '$encoder.jsEscape($i18n.getString( 'report_type' ) , "'")',
-case_based_report: '$encoder.jsEscape($i18n.getString( 'case_based_report' ) , "'")',
-aggregated_report: '$encoder.jsEscape($i18n.getString( 'aggregated_report' ) , "'")',
-aggregate_type: '$encoder.jsEscape($i18n.getString( 'aggregate_type' ) , "'")',
-count: '$encoder.jsEscape($i18n.getString( 'count' ) , "'")',
-sum: '$encoder.jsEscape($i18n.getString( 'sum' ) , "'")',
-avg: '$encoder.jsEscape($i18n.getString( 'avg' ) , "'")',
-group_by: '$encoder.jsEscape($i18n.getString( 'group_by' ) , "'")',
-period: '$encoder.jsEscape($i18n.getString( 'period' ) , "'")',
-relative_periods: '$encoder.jsEscape($i18n.getString( 'relative_periods' ) , "'")',
-months: '$encoder.jsEscape($i18n.getString( 'months' ) , "'")',
-last_month: '$encoder.jsEscape($i18n.getString( 'last_month' ) , "'")',
-last_3_months: '$encoder.jsEscape($i18n.getString( 'last_3_months' ) , "'")',
-last_12_months: '$encoder.jsEscape($i18n.getString( 'last_12_months' ) , "'")',
-quarters: '$encoder.jsEscape($i18n.getString( 'quarters' ) , "'")',
-last_quarter: '$encoder.jsEscape($i18n.getString( 'last_quarter' ) , "'")',
-last_4_quarters: '$encoder.jsEscape($i18n.getString( 'last_4_quarters' ) , "'")',
-six_months: '$encoder.jsEscape($i18n.getString( 'six_months' ) , "'")',
-last_six_month: '$encoder.jsEscape($i18n.getString( 'last_six_month' ) , "'")',
-last_two_six_month: '$encoder.jsEscape($i18n.getString( 'last_two_six_month' ) , "'")',
-years: '$encoder.jsEscape($i18n.getString( 'years' ) , "'")',
-this_year: '$encoder.jsEscape($i18n.getString( 'this_year' ) , "'")',
-last_year: '$encoder.jsEscape($i18n.getString( 'last_year' ) , "'")',
-last_5_years: '$encoder.jsEscape($i18n.getString( 'last_5_years' ) , "'")',
-fixed_periods: '$encoder.jsEscape($i18n.getString( 'fixed_periods' ) , "'")',
-select_type: '$encoder.jsEscape($i18n.getString( 'select_type' ) , "'")',
-period_type: '$encoder.jsEscape($i18n.getString( 'period_type' ) , "'")',
-report_option: '$encoder.jsEscape($i18n.getString( 'report_option' ) , "'")',
-limit_records: '$encoder.jsEscape($i18n.getString( 'limit_records' ) , "'")',
-data_element_name: '$encoder.jsEscape($i18n.getString( 'data_element_name' ) , "'")',
-value: '$encoder.jsEscape($i18n.getString( 'value' ) , "'")',
-em_no_dataelement:'$encoder.jsEscape($i18n.getString( 'em_no_dataelement' ) , "'")',
-em_no_period: '$encoder.jsEscape($i18n.getString( 'em_no_period' ) , "'")',
-period_range: '$encoder.jsEscape($i18n.getString( 'period_range' ) , "'")',
-position: '$encoder.jsEscape($i18n.getString( 'position' ) , "'")',
-orgunit: '$encoder.jsEscape($i18n.getString( 'orgunit' ) , "'")',
-data: '$encoder.jsEscape($i18n.getString( 'data' ) , "'")',
-select_data_element_for_grouping: '$encoder.jsEscape($i18n.getString( 'select_data_element_for_grouping' ) , "'")',
-filter_value: '$encoder.jsEscape($i18n.getString( 'filter_value' ) , "'")',
-add: '$encoder.jsEscape($i18n.getString( 'add' ) , "'")',
-xls: '$encoder.jsEscape($i18n.getString( 'xls' ) , "'")',
-pdf: '$encoder.jsEscape($i18n.getString( 'pdf' ) , "'")',
-csv: '$encoder.jsEscape($i18n.getString( 'csv' ) , "'")',
-rows: '$encoder.jsEscape($i18n.getString( 'rows' ) , "'")',
-columns: '$encoder.jsEscape($i18n.getString( 'columns' ) , "'")',
-filters: '$encoder.jsEscape($i18n.getString( 'filters' ) , "'")',
-wm_multiple_filter_ind_de: '$encoder.jsEscape($i18n.getString( 'wm_multiple_filter_ind_de' ) , "'")',
-selected_items: '$encoder.jsEscape($i18n.getString( 'selected_items' ) , "'")',
-fill_filter_values_for_all_selected_data_elements: '$encoder.jsEscape($i18n.getString( 'fill_filter_values_for_all_selected_data_elements' ) , "'")',
-data_items: '$encoder.jsEscape($i18n.getString( 'data_items' ) , "'")',
-use_completed_events: '$encoder.jsEscape($i18n.getString( 'use_completed_events' ) , "'")',
-show_hide_selected_values: '$encoder.jsEscape($i18n.getString( 'show_hide_filter_values' ) , "'")',
-date_period_range: '$encoder.jsEscape($i18n.getString( 'date_period_range' ) , "'")',
-select_from_date: '$encoder.jsEscape($i18n.getString( 'select_from_date' ) , "'")',
-select_to_date: '$encoder.jsEscape($i18n.getString( 'select_to_date' ) , "'")',
-user_orgunit: '$encoder.jsEscape($i18n.getString( 'user_orgunit' ) , "'")',
-user_orgunit_children: '$encoder.jsEscape($i18n.getString( 'user_orgunit_children' ) , "'")',
-auto_select_orgunit_by: '$encoder.jsEscape($i18n.getString( 'auto_select_orgunit_by' ) , "'")',
-in: '$encoder.jsEscape($i18n.getString( 'in' ) , "'")',
-like: '$encoder.jsEscape($i18n.getString( 'like' ) , "'")',
-select_all_children: '$encoder.jsEscape($i18n.getString( 'select_all_children' ) , "'")',
-total: '$encoder.jsEscape($i18n.getString( 'total' ) , "'")',
-confirm_delete_date_range_list: '$encoder.jsEscape($i18n.getString( 'confirm_delete_date_range_list' ) , "'")',
-invalid_position: '$encoder.jsEscape($i18n.getString( 'invalid_position' ) , "'")',
-sum_avg_of: '$encoder.jsEscape($i18n.getString( 'sum_avg_of' ) , "'")',
-select_a_dataelement_for_sum_avg_operator: '$encoder.jsEscape($i18n.getString( 'select_a_dataelement_for_sum_avg_operator' ) , "'")',
-multiple_periods_selected_as_filter: '$encoder.jsEscape($i18n.getString( 'multiple_periods_selected_as_filter' ) , "'")',
-multiple_orgunits_selected_as_filter: '$encoder.jsEscape($i18n.getString( 'multiple_orgunits_selected_as_filter' ) , "'")',
-please_select_one_position_for_row: '$encoder.jsEscape($i18n.getString( 'please_select_one_position_for_row' ) , "'")',
-please_select_one_position_for_filter: '$encoder.jsEscape($i18n.getString( 'please_select_one_position_for_filter' ) , "'")',
-male: '$encoder.jsEscape($i18n.getString( 'male' ) , "'")',
-female: '$encoder.jsEscape($i18n.getString( 'female' ) , "'")',
-transgender: '$encoder.jsEscape($i18n.getString( 'transgender' ) , "'")',
-verified: '$encoder.jsEscape($i18n.getString( 'verified' ) , "'")',
-declared: '$encoder.jsEscape($i18n.getString( 'declared' ) , "'")',
-approximated: '$encoder.jsEscape($i18n.getString( 'approximated' ) , "'")',
-remove: '$encoder.jsEscape($i18n.getString( 'remove' ) , "'")',
-weeks: '$encoder.jsEscape($i18n.getString( 'weeks' ) , "'")',
-last_week: '$encoder.jsEscape($i18n.getString( 'last_week' ) , "'")',
-last_4_weeks: '$encoder.jsEscape($i18n.getString( 'last_4_weeks' ) , "'")',
-last_12_weeks: '$encoder.jsEscape($i18n.getString( 'last_12_weeks' ) , "'")',
-favorite_name: '$encoder.jsEscape($i18n.getString( 'favorite_name' ) , "'")',
-create: '$encoder.jsEscape($i18n.getString( 'create' ) , "'")',
-add_new: '$encoder.jsEscape($i18n.getString( 'add_new' ) , "'")',
-page: '$encoder.jsEscape($i18n.getString( 'page' ) , "'")',
-of: '$encoder.jsEscape($i18n.getString( 'of' ) , "'")',
-create_new_favorite: '$encoder.jsEscape($i18n.getString( 'create_new_favorite' ) , "'")',
-search_for_favorites: '$encoder.jsEscape($i18n.getString( 'search_for_favorites' ) , "'")',
-prev: '$encoder.jsEscape($i18n.getString( 'prev' ) , "'")',
-next: '$encoder.jsEscape($i18n.getString( 'next' ) , "'")',
-confirm_delete_favorite: '$encoder.jsEscape($i18n.getString( 'confirm_delete_favorite' ) , "'")',
-home: '$encoder.jsEscape($i18n.getString( 'home' ) , "'")',
-aggregate_options: '$encoder.jsEscape($i18n.getString( 'aggregate_options' ) , "'")',
-display_totals: '$encoder.jsEscape($i18n.getString( 'display_totals' ) , "'")',
-options: '$encoder.jsEscape($i18n.getString( 'options' ) , "'")',
-hide: '$encoder.jsEscape($i18n.getString( 'hide' ) , "'")',
-can_view: '$encoder.jsEscape($i18n.getString( 'can_view' ) , "'")',
-can_edit_and_view: '$encoder.jsEscape($i18n.getString( 'can_edit_and_view' ) , "'")',
-public_access: '$encoder.jsEscape($i18n.getString( 'public_access' ) , "'")',
-display_orgunit_code: '$encoder.jsEscape($i18n.getString( 'display_orgunit_code' ) , "'")',
-use_data_element_form_names: '$encoder.jsEscape($i18n.getString( 'use_data_element_form_names' ) , "'")',
-section: '$encoder.jsEscape($i18n.getString( 'section' ) , "'")',
-table_layout: '$encoder.jsEscape($i18n.getString( 'table_layout' ) , "'")',
-column: '$encoder.jsEscape($i18n.getString( 'column' ) , "'")',
-row: '$encoder.jsEscape($i18n.getString( 'row' ) , "'")',
-periods: '$encoder.jsEscape($i18n.getString( 'periods' ) , "'")',
-last_52_weeks: '$encoder.jsEscape($i18n.getString( 'last_52_weeks' ) , "'")',
-bimonths: '$encoder.jsEscape($i18n.getString( 'bimonths' ) , "'")',
-last_bimonth: '$encoder.jsEscape($i18n.getString( 'last_bimonth' ) , "'")',
-last_6_months: '$encoder.jsEscape($i18n.getString( 'last_6_months' ) , "'")',
-months_last_year: '$encoder.jsEscape($i18n.getString( 'months_last_year' ) , "'")',
-months_this_year: '$encoder.jsEscape($i18n.getString( 'months_this_year' ) , "'")',
-quarters_last_year: '$encoder.jsEscape($i18n.getString( 'quarters_last_year' ) , "'")',
-quarters_this_year: '$encoder.jsEscape($i18n.getString( 'quarters_this_year' ) , "'")',
-last_6_bimonths: '$encoder.jsEscape($i18n.getString( 'last_6_bimonths' ) , "'")',
-female: '$encoder.jsEscape($i18n.getString( 'female' ) , "'")',
-male: '$encoder.jsEscape($i18n.getString( 'male' ) , "'")',
-transgender: '$encoder.jsEscape($i18n.getString( 'transgender' ) , "'")',
-immediate_children: '$encoder.jsEscape($i18n.getString( 'immediate_children' ) , "'")',
-delete: '$encoder.jsEscape($i18n.getString( 'delete' ) , "'")',
-dimension: '$encoder.jsEscape($i18n.getString( 'dimension' ) , "'")',
-filter: '$encoder.jsEscape($i18n.getString( 'filter' ) , "'")',
-};
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm 2014-03-17 06:27:47 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm 2014-04-06 18:03:57 +0000
@@ -13,10 +13,6 @@
#if( $auth.hasAccess( "dhis-web-caseentry", "smsReminderSelect" ) )
#introListImgItem( "smsReminderSelect.action" "program_tracking" "summaryreport" )
#end
-
- #if( $auth.hasAccess( "dhis-web-caseentry", "multipledataEntrySelect" ) )
- #introListImgItem( "multipledataEntrySelect.action" "multiple_individual_records" "attribute" )
- #end
#if( $auth.hasAccess( "dhis-web-caseentry", "singleEventSelect" ) )
#introListImgItem( "singleEventSelect.action" "single_event_with_registration" "attribute" )
=== removed file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/multiDataEntry.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/multiDataEntry.js 2014-04-06 15:48:31 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/multiDataEntry.js 1970-01-01 00:00:00 +0000
@@ -1,146 +0,0 @@
-isAjax = true;
-
-function multiDataEntryOrgunitSelected( orgUnits, orgUnitNames ) {
- hideById('entityInstanceDashboard');
- showById('searchDiv');
- showById('mainLinkLbl');
- var width = jQuery('#program').width();
- jQuery('#program').width(width - 30);
- showById("programLoader");
- disable('program');
- setFieldValue('orgunitName', orgUnitNames[0]);
- setFieldValue('orgunitId', orgUnits[0]);
- hideById("listEntityInstanceDiv");
- clearListById('program');
- $('#contentDataRecord').html('');
-
- jQuery.get("getPrograms.action", {}, function( json ) {
- var count = 0;
-
- for( i in json.programs ) {
- if( json.programs[i].type == 1 ) {
- count++;
- jQuery('#program').append('<option value="' + json.programs[i].id + '" type="' + json.programs[i].type + '">' + json.programs[i].name + '</option>');
- }
- }
-
- if( count == 0 ) {
- jQuery('#program').prepend('<option value="" >' + i18n_none_program + '</option>');
- } else if( count > 1 ) {
- jQuery('#program').prepend('<option value="" selected>' + i18n_please_select + '</option>');
- }
-
- enableBtn();
- hideById('programLoader');
- jQuery('#program').width(width);
- enable('program');
- });
-}
-
-selection.setListenerFunction( multiDataEntryOrgunitSelected );
-
-function listAllTrackedEntityInstance()
-{
- var scheduledVisitDays = getFieldValue('scheduledVisitDays');
-
- if( scheduledVisitDays != '' ) {
- var today = getCurrentDate();
- var date = new Date();
- var d = date.getDate();
- var m = date.getMonth();
- var y = date.getFullYear();
- var lastDays = jQuery.datepicker.formatDate(dateFormat, new Date(y, m, d - eval(scheduledVisitDays)));
-
- var searchTexts = "stat_" + getFieldValue('program') + "_" + lastDays + "_" + today + "_"
- + getFieldValue('orgunitId') + "_false_" + getFieldValue('statusEvent');
-
- getTrackedEntityInstanceList(searchTexts);
- }
-}
-
-function getTrackedEntityInstanceList(searchTexts)
-{
- hideById('listEntityInstanceDiv');
- hideById('advanced-search');
- hideById('contentDataRecord');
- var programId = getFieldValue('program');
-
- var data = {};
- data.listAll = false;
- data.searchTexts = searchTexts;
-
- if( !isNaN(programId) || programId == null) {
- data.programId = parseInt(programId);
- }
-
- showLoader();
- jQuery('#listEntityInstanceDiv').load('getDataRecords.action', data, function() {
- setInnerHTML('searchInforLbl', i18n_list_all_tracked_entity_instances);
- showById('listEntityInstanceDiv');
- setTableStyles();
- hideLoader();
- });
-}
-
-// --------------------------------------------------------------------
-// Search events
-// --------------------------------------------------------------------
-
-function advancedSearch( params )
-{
- hideById('contentDataRecord');
- hideById('listEntityInstanceDiv');
- showLoader();
-
- var programId = getFieldValue('program');
-
- if( !isNaN(programId) || programId == null) {
- params += "&programId=" + parseInt(programId);
- }
-
- $.ajax({
- url: 'getDataRecords.action',
- type: "POST",
- data: params,
- success: function( html ) {
- setTableStyles();
- jQuery('#listEntityInstanceDiv').html(html);
- showById('listEntityInstanceDiv');
- hideLoader();
- }
- });
-}
-
-function loadDataEntryDialog( programStageInstanceId )
-{
- jQuery("#entityInstanceList input[name='programStageBtn']").each(function(i,item){
- jQuery(item).removeClass('stage-object-selected');
- });
- jQuery( '#' + prefixId + programStageInstanceId ).addClass('stage-object-selected');
-
- $('#contentDataRecord' ).load("viewProgramStageRecords.action", {
- programStageInstanceId: programStageInstanceId
- },function() {
- setFieldValue( 'programStageInstanceId', programStageInstanceId );
- showById('entityInstanceInforTB');
- }).dialog({
- title:i18n_program_stage,
- maximize:true,
- closable:true,
- modal:false,
- overlay:{background:'#000000', opacity:0.1},
- width:850,
- height:500
- });
-}
-
-function loadProgramStageRecords( programStageInstanceId )
-{
- setInnerHTML('dataEntryFormDiv', '');
- showLoader();
- $('#dataEntryFormDiv').load("loadProgramStageRecords.action", {
- programStageInstanceId: programStageInstanceId
- }, function() {
- hideLoader();
- });
-}
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm 2014-03-17 06:27:47 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm 2014-04-06 18:03:57 +0000
@@ -20,9 +20,6 @@
<h2>$i18n.getString( "data_entry" ) </h2>
#end
<ul>
- #if( $auth.hasAccess( "dhis-web-caseentry", "multipledataEntrySelect" ) )
- <li><a href="multipledataEntrySelect.action">$i18n.getString( "multiple_individual_records" ) </a></li>
- #end
#if( $auth.hasAccess( "dhis-web-caseentry", "singleEventSelect" ) )
<li><a href="singleEventSelect.action">$i18n.getString( "single_event_with_registration" )</a></li>
#end
=== removed file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/multiDataEntrySelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/multiDataEntrySelect.vm 2014-04-06 15:48:31 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/multiDataEntrySelect.vm 1970-01-01 00:00:00 +0000
@@ -1,91 +0,0 @@
-<script>
- jQuery(document).ready(function() {
- jQuery("#program option").each(function() {
- var item = jQuery(this);
- if( item.attr('type') != 1 && item.val() != '' ) {
- item.remove();
- }
- });
-
- if( jQuery("#program option").length == 1 ) {
- jQuery("#program [value=]").remove();
- }
-
- disable('scheduledVisitDays');
- hideById('addEntityInstanceBtn');
- var i18n_list_events = '$encoder.jsEscape( $i18n.getString( "list_events" ) , "'")';
- setFieldValue('listEntityInstanceBtn', i18n_list_events);
- showById('dueDateTR');
- showById('programStageAddEntityInstanceTR');
- showById('scheduleVisitTR');
- showById('advancedSearchBtn');
-
- jQuery("#searchObjectId [value=prg]").remove();
- registration = false;
-
- jQuery('#searchByIdTR').remove();
- jQuery('#listEntityInstanceBtnTD').attr('rowspan', 5);
- jQuery('#listEntityInstanceBtnTD').attr('valign', 'bottom');
- });
-</script>
-
-<h3 id='mainLinkLbl'>$i18n.getString( "multiple_individual_records_management" ) #openHelp('multiple_individual_records')</h3>
-<form>
- <input type='hidden' id='isRegistration' name= 'isRegistration' value='false'>
- <input type='hidden' id='searchByProgramStage' name= 'searchByProgramStage' value='true'>
- <div id='searchDiv'>
- #parse( "dhis-web-caseentry/searchTrackedEntityInstanceCriteria.vm" )
- </div>
-</form>
-
-#parse( "dhis-web-commons/loader/loader.vm" )
-
-<div id='listEntityInstanceDiv'></div>
-<div id='entityInstanceDashboard'></div> <!-- TrackedEntityInstance dashboard -->
-<div id='smsManagementDiv'></div>
-<div id='sendSmsFormDiv'></div>
-<div id='editEntityInstanceDiv'></div> <!-- Add TrackedEntityInstance Form -->
-<div id='resultSearchDiv' style='font-size:13px'></div> <!-- List searching TrackedEntityInstances -->
-<div id='enrollmentDiv'></div> <!-- Program Enrollment Form -->
-<div id='listRelationshipDiv'></div> <!-- List relationship -->
-<div id='addRelationshipDiv'></div> <!-- Add relationship -->
-<div id='migrationEntityInstanceDiv'></div> <!-- Migration TrackedEntityInstance -->
-<div id='contentDataRecord'></div>
-
-<script>
- unSave = false;
- statusSearching = 3;
- var i18n_please_select = '[' + '$encoder.jsEscape( $i18n.getString( "please_select" ) , "'")' + ']';
- var i18n_please_select_program_stage = '[' + '$encoder.jsEscape( $i18n.getString( "please_select_program_stage" ) , "'")' + ']';
- var i18n_value_must_integer = '$encoder.jsEscape( $i18n.getString( "value_must_integer" ) , "'")';
- var i18n_value_must_number = '$encoder.jsEscape( $i18n.getString( "value_must_number" ) , "'")';
- var i18n_value_must_positive_integer = '$encoder.jsEscape( $i18n.getString( "value_must_positive_integer" ) , "'")';
- var i18n_value_must_zero_or_positive_integer = '$encoder.jsEscape( $i18n.getString( "value_must_zero_or_positive_integer" ) , "'")';
- var i18n_value_must_negative_integer = '$encoder.jsEscape( $i18n.getString( "value_must_negative_integer" ) , "'")';
- var i18n_value_must_unit_interval = '$encoder.jsEscape( $i18n.getString( "value_must_unit_interval" ) , "'")';
- var i18n_invalid_date = '$encoder.jsEscape( $i18n.getString( "invalid_date" ) , "'")';
- var i18n_saving_value_failed_status_code = '$encoder.jsEscape( $i18n.getString( "saving_value_failed_status_code" ) , "'")';
- var i18n_saving_value_failed_error_code = '$encoder.jsEscape( $i18n.getString( "saving_value_failed_error_code" ) , "'")';
- var i18n_searching_tracked_entity_instance_failed = '$encoder.jsEscape( $i18n.getString( "searching_tracked_entity_instance_failed" ) , "'")';
- var i18n_complete_confirm_message = '$encoder.jsEscape( $i18n.getString( "complete_confirm_message" ) , "'")';
- var i18n_quit_confirm_message = '$encoder.jsEscape( $i18n.getString( "quit_confirm_message" ) , "'")';
- var i18n_incomplete_confirm_message = '$encoder.jsEscape( $i18n.getString( "incomplete_confirm_message" ) , "'")';
- var i18n_reenrollment_confirm_message = '$encoder.jsEscape( $i18n.getString( "reenrollment_confirm_message" ) , "'")';
- var i18n_error_required_field = '$encoder.jsEscape( $i18n.getString( "error_required_field" ) , "'")';
- var i18n_violate_validation = '$encoder.jsEscape( $i18n.getString( "violate_validation" ) , "'")';
- var i18n_date_less_incident_date = '$encoder.jsEscape( $i18n.getString( "date_less_incident_date" ) , "'")';
- var i18n_scheduled_in_future = '$encoder.jsEscape( $i18n.getString( "scheduled_in_future" ) , "'")';
-
- var i18n_id = '$encoder.jsEscape( $i18n.getString( "id" ), "'")';
- var i18n_none = '$encoder.jsEscape( $i18n.getString( "none" ), "'")';
- var i18n_show_all_items = '$encoder.jsEscape( $i18n.getString( "show_all_items" ) , "'")';
- var i18n_program_stage = '$encoder.jsEscape( $i18n.getString( "program_stage" ) , "'")';
- var i18n_color_quick_help = '$encoder.jsEscape( $i18n.getString( "color_quick_help" ) , "'")';
- var i18n_comment_added = '$encoder.jsEscape( $i18n.getString( "comment_added" ) , "'")';
- var i18n_list_all_tracked_entity_instances = '$encoder.jsEscape( $i18n.getString( "list_all_tracked_entity_instances" ), "'")';
- var i18n_main_form_link = '$encoder.jsEscape( $i18n.getString( "multiple_individual_records_management" ), "'")';
- var i18n_tracked_entity_instance_details_and_history = '$encoder.jsEscape( $i18n.getString( "tracked_entity_instance_details_and_history" ), "'")';
- var i18n_insert_a_report_date = '$encoder.jsEscape( $i18n.getString( "insert_a_report_date" ) , "'")';
- var i18n_comment = '$encoder.jsEscape( $i18n.getString( "comment" ) , "'")';
- var i18n_message = '$encoder.jsEscape( $i18n.getString( "message" ) , "'")';
-</script>
