dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #17090
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 6699: Removed unused files
------------------------------------------------------------
revno: 6699
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-04-23 12:45:46 +0200
message:
Removed unused files
removed:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responseCategoryCombo.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responseDataElementGroup.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responseDataSetObject.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responseIndicatorGroup.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responseOptionCombo.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responseOrganisationUnitLevel.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responseParentDataSetObject.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responsePeriodType.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responsePeriodTypeList.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responsePivotAssociationTable.vm
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataEntryForm.js
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataEntryForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataEntryForm.js 2012-03-04 13:46:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataEntryForm.js 2012-04-23 10:45:46 +0000
@@ -98,13 +98,6 @@
}
}
-
-// TODO: remove this? does not seem to be used anywhere, updating to ckeditor just in case
-function onloadFunction()
-{
- htmlCode = $("#designTextarea").ckeditorGet().getData();
- findDataElementCount();
-}
// -----------------------------------------------------------------------------
// Auto-save DataEntryForm
// -----------------------------------------------------------------------------
@@ -134,7 +127,8 @@
}
}
-function autoSaveDataEntryForm() {
+function autoSaveDataEntryForm()
+{
var field = $("#designTextarea").ckeditorGet();
var designTextarea = htmlEncode(field.getData());
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responseCategoryCombo.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responseCategoryCombo.vm 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responseCategoryCombo.vm 1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<categoryCombo>
- <categories>
- #foreach( $category in $categoryList )
- <category id="$category.id">$encoder.xmlEncode( $category.name )</category>
- #end
- </categories>
-</categoryCombo>
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responseDataElementGroup.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responseDataElementGroup.vm 2011-05-09 10:42:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responseDataElementGroup.vm 1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dataElementGroup>
- <dataElements>
- #foreach( $dataElement in $dataElements )
- <dataElement id="$dataElement.id">$encoder.xmlEncode( $dataElement.name )</dataElement>
- #end
- </dataElements>
-</dataElementGroup>
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responseDataSetObject.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responseDataSetObject.vm 2010-11-20 08:23:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responseDataSetObject.vm 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dataSet>
- <id>$dataSet.id</id>
- <name>$encoder.xmlEncode( $dataSet.name )</name>
- <shortName>$!encoder.xmlEncode( $dataSet.shortName )</shortName>
- <frequency>$i18n.getString( $dataSet.periodType.name )</frequency>
- <dataElementCount>$dataSetDataElements.size()</dataElementCount>
- <dataentryform>#if(!$dataEntryForm) #else $encoder.xmlEncode( $dataEntryForm.name )#end</dataentryform>
-</dataSet>
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responseIndicatorGroup.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responseIndicatorGroup.vm 2011-05-09 10:51:37 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responseIndicatorGroup.vm 1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<indicatorGroup>
- <indicators>
- #foreach( $indicator in $indicators )
- <indicator id="$indicator.id">$encoder.xmlEncode( $indicator.name )</indicator>
- #end
- </indicators>
-</indicatorGroup>
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responseOptionCombo.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responseOptionCombo.vm 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responseOptionCombo.vm 1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-#set($count = 0)
-<optionCombo>
- <categoryOptions>
- #foreach( $optionComboId in $optionComboIds )
- #set($optionComboName = $optionComboNames.get($count))
- <categoryOption id="$optionComboId">$encoder.xmlEncode( $optionComboName )</categoryOption>
- #set($count = $count + 1)
- #end
- </categoryOptions>
-</optionCombo>
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responseOrganisationUnitLevel.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responseOrganisationUnitLevel.vm 2010-08-20 07:54:16 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responseOrganisationUnitLevel.vm 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-{ "organisationUnitLevels": [
-#foreach ( $level in $levels )
- {
- "id": $!{level.id},
- "level": $!{level.level},
- "name": "$!{level.name}"
- },
-#end
-] }
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responseParentDataSetObject.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responseParentDataSetObject.vm 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responseParentDataSetObject.vm 1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<parentDataSet>
- <id>$parentDataSet.id</id>
- <name>$encoder.xmlEncode( $parentDataSet.name )</name>
- <frequency>$parentDataSet.periodType.id</frequency>
- <parentDataSetDataElements>
- #foreach( $parentDataSetDataElement in $parentDataSetDataElements )
- <parentDataSetDataElement>$encoder.xmlEncode( $parentDataSetDataElement.name )</parentDataSetDataElement>
- #end
- </parentDataSetDataElements>
-</parentDataSet>
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responsePeriodType.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responsePeriodType.vm 2010-08-20 07:54:16 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responsePeriodType.vm 1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-{ "periodTypes": [
-#foreach( $periodType in $periodTypes )
- {
- "id": $!{periodType.id},
- "name": "$!{periodType.name}"
- },
-#end
-] }
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responsePeriodTypeList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responsePeriodTypeList.vm 2010-03-24 02:56:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responsePeriodTypeList.vm 1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<periodTypes>
- #foreach($periodType in $periodTypes)
- <periodType>
- <id>$periodType.name</id>
- <name>$periodType.name</name>
- </periodType>
- #end
-</periodTypes>
\ No newline at end of file
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responsePivotAssociationTable.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responsePivotAssociationTable.vm 2010-08-20 07:54:16 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responsePivotAssociationTable.vm 1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-{
- "pivottable":
- {
- "sizeDataSets": "$associationtable.dataSets.size()",
- "sizeOrganisationUnits": "$associationtable.organisationUnits.size()",
- "dataSets":
- [
- #foreach( $dataSet in $associationtable.dataSets )
- { "id": "${dataSet.id}", "name": "${dataSet.name}" },
- #end
- ],
- "organisationUnits":
- [
- #foreach( $organisationUnit in $associationtable.organisationUnits )
- { "id": "${organisationUnit.id}", "name": "${organisationUnit.name}" },
- #end
- ],
- "associations":
- [
- {
- #foreach( $value in $associationtable.associations )
- "${value.dataSetId}-${value.organisationUnitId}": "${value.assigned}",
- #end
- }
- ]
- }
-}
\ No newline at end of file
