dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #07091
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1995: Work in progress on indicator chart
------------------------------------------------------------
revno: 1995
committer: Lars <larshelg@larshelg-laptop>
branch nick: trunk
timestamp: Sat 2010-08-28 13:17:53 +0200
message:
Work in progress on indicator chart
added:
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartIndicatorModeForm.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartOrgunitOrPeriodForm.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
=== added file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartIndicatorModeForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartIndicatorModeForm.vm 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartIndicatorModeForm.vm 2010-08-28 11:17:53 +0000
@@ -0,0 +1,132 @@
+<table>
+<!-- Periods -->
+
+<tr>
+ <th colspan="2">$i18n.getString( "category_y_available_periods" )</th>
+</tr>
+<tr>
+ <td>
+ <input type="button" style="width:60px" value="$i18n.getString( 'prev' )" onclick="getAvailablePeriods( 'periodType', 'availablePeriods', 'selectedPeriods', '-1' )"><input
+ type="button" style="width:60px" value="$i18n.getString( 'next' )" onclick="getAvailablePeriods( 'periodType', 'availablePeriods', 'selectedPeriods', '1' )">
+ <select id="periodType" name="periodType" style="min-width:478px" onchange="getAvailablePeriods( 'periodType', 'availablePeriods', 'selectedPeriods', '0' )">
+ <option value="">[ $i18n.getString( "select_period_type_all" ) ]</option>
+ #foreach ( $type in $periodTypes )
+ <option value="$type.name">$type.name</option>
+ #end
+ </select>
+ </td>
+</tr>
+<tr>
+ <td colspan="2">
+ <select multiple size="6" id="availablePeriods" name="availablePeriods" style="min-width:600px" ondblclick="moveSelectedById( 'availablePeriods', 'selectedPeriods' )">
+ #foreach ( $period in $availablePeriods )
+ <option value="$period.externalId">$format.formatPeriod( $period )</option>
+ #end
+ </select>
+ </td>
+</tr>
+
+<tr>
+ <td colspan="2">
+ <input type="button" value="$i18n.getString( 'add_selected' )" title="$i18n.getString( 'add_selected' )" style="width:120px" onclick="moveSelectedById( 'availablePeriods', 'selectedPeriods' )"><input
+ type="button" value="$i18n.getString( 'add_all' )" title="$i18n.getString( 'add_all' )" style="width:120px" onclick="moveAllById( 'availablePeriods', 'selectedPeriods' )"><input
+ type="button" value="$i18n.getString( 'remove_selected' )" title="$i18n.getString( 'remove_selected' )" style="width:120px" onclick="moveSelectedById( 'selectedPeriods', 'availablePeriods' )"><input
+ type="button" value="$i18n.getString( 'remove_all' )" title="$i18n.getString( 'remove_all' )" style="width:120px" onclick="moveAllById( 'selectedPeriods', 'availablePeriods' )">
+ </td>
+</tr>
+
+<tr>
+ <th colspan="2">$i18n.getString( "category_y_selected_periods" )</th>
+</tr>
+<tr>
+ <td>
+ <select size="6" id="selectedPeriods" name="selectedPeriods" style="min-width:600px" multiple ondblclick="moveSelectedById( 'selectedPeriods', 'availablePeriods' )">
+ #foreach ( $period in $selectedPeriods )
+ <option value="$period.externalId">$format.formatPeriod( $period )</option>
+ #end
+ </select>
+ </td>
+ <td></td>
+</tr>
+<tr>
+ <td colspan="2" style="height:15px"></td>
+</tr>
+
+<!-- Indicators -->
+ <tr>
+ <th colspan="2">$i18n.getString( "value_x_available_indicators" )</th>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <select id="indicatorGroupId" name="indicatorGroupId" style="min-width:600px" onchange="getIndicators()">
+ <option value="$ALL">[ $i18n.getString( "select_indicatorgroup_all" ) ]</option>
+ #foreach ( $group in $indicatorGroups )
+ <option value="$group.id">$group.name</option>
+ #end
+ </select>
+ </td>
+ <td></td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <select multiple size="6" id="availableIndicators" name="availableIndicators" style="min-width:600px" ondblclick="moveSelectedById( 'availableIndicators', 'selectedIndicators' )">
+ #foreach ( $indicator in $availableIndicators )
+ <option value="$indicator.id">$indicator.name</option>
+ #end
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <input type="button" value="$i18n.getString( 'add_selected' )" title="$i18n.getString( 'add_selected' )" style="width:120px" onclick="moveSelectedById( 'availableIndicators', 'selectedIndicators' )"><input
+ type="button" value="$i18n.getString( 'add_all' )" title="$i18n.getString( 'add_all' )" style="width:120px" onclick="moveAllById( 'availableIndicators', 'selectedIndicators' )"><input
+ type="button" value="$i18n.getString( 'remove_selected' )" title="$i18n.getString( 'remove_selected' )" style="width:120px" onclick="moveSelectedById( 'selectedIndicators', 'availableIndicators' )"><input
+ type="button" value="$i18n.getString( 'remove_all' )" title="$i18n.getString( 'remove_all' )" style="width:120px" onclick="moveAllById( 'selectedIndicators', 'availableIndicators' )">
+ </td>
+ </tr>
+ <tr>
+ <th colspan="2">$i18n.getString( "value_x_selected_indicators" )</th>
+ </tr>
+ <tr>
+ <td>
+ <select multiple size="6" id="selectedIndicators" name="selectedIndicators" style="min-width:600px" ondblclick="moveSelectedById( 'selectedIndicators', 'availableIndicators' )">
+ #foreach( $indicator in $selectedIndicators )
+ <option value="$indicator.id">$indicator.name</option>
+ #end
+ </select>
+ </td>
+ <td>
+ <a href="#" onclick="moveUpSelectedOption( 'selectedIndicators' )"><img src="../images/move_up.png" border="0" alt=""></a><br><br>
+ <a href="#" onclick="moveDownSelectedOption( 'selectedIndicators' )"><img src="../images/move_down.png" border="0" alt=""></a>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2" style="height:15px"></td>
+ </tr>
+
+<!-- OrganisationUnit -->
+
+<tr>
+ <th colspan="2">$i18n.getString( "filter_available_organisationunits" )</th>
+</tr>
+<tr>
+ <td colspan="2">
+ <select id="organisationUnitLevel" name="organisationUnitLevel" style="min-width:600px" onchange="getOrganisationUnitsToSelected()">
+ <option value="$ALL">[ $i18n.getString( "select_organisationunit_level_all" ) ]</option>
+ #foreach ( $level in $levels )
+ <option value="$level.level">$encoder.htmlEncode( $level.name )</option>
+ #end
+ </select>
+ </td>
+</tr>
+<tr>
+ <td colspan="2">
+ <select id="selectedOrganisationUnits" name="selectedOrganisationUnits" style="min-width:600px">
+ #foreach ( $unit in $selectedOrganisationUnits )
+ <option value="$unit.id">$unit.name</option>
+ #end
+ </select>
+ </td>
+</tr>
+
+</table>
\ No newline at end of file
=== added file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartOrgunitOrPeriodForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartOrgunitOrPeriodForm.vm 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartOrgunitOrPeriodForm.vm 2010-08-28 11:17:53 +0000
@@ -0,0 +1,72 @@
+<table>
+
+ <col>
+ <col width="16">
+
+ <!-- Indicators -->
+ <tr>
+ <th colspan="2">$i18n.getString( "value_y_available_indicators" )</th>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <select id="indicatorGroupId" name="indicatorGroupId" style="min-width:600px" onchange="getIndicators()">
+ <option value="$ALL">[ $i18n.getString( "select_indicatorgroup_all" ) ]</option>
+ #foreach ( $group in $indicatorGroups )
+ <option value="$group.id">$group.name</option>
+ #end
+ </select>
+ </td>
+ <td></td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <select multiple size="6" id="availableIndicators" name="availableIndicators" style="min-width:600px" ondblclick="moveSelectedById( 'availableIndicators', 'selectedIndicators' )">
+ #foreach ( $indicator in $availableIndicators )
+ <option value="$indicator.id">$indicator.name</option>
+ #end
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <input type="button" value="$i18n.getString( 'add_selected' )" title="$i18n.getString( 'add_selected' )" style="width:120px" onclick="moveSelectedById( 'availableIndicators', 'selectedIndicators' )"><input
+ type="button" value="$i18n.getString( 'add_all' )" title="$i18n.getString( 'add_all' )" style="width:120px" onclick="moveAllById( 'availableIndicators', 'selectedIndicators' )"><input
+ type="button" value="$i18n.getString( 'remove_selected' )" title="$i18n.getString( 'remove_selected' )" style="width:120px" onclick="moveSelectedById( 'selectedIndicators', 'availableIndicators' )"><input
+ type="button" value="$i18n.getString( 'remove_all' )" title="$i18n.getString( 'remove_all' )" style="width:120px" onclick="moveAllById( 'selectedIndicators', 'availableIndicators' )">
+ </td>
+ </tr>
+ <tr>
+ <th colspan="2">$i18n.getString( "value_y_selected_indicators" )</th>
+ </tr>
+ <tr>
+ <td>
+ <select multiple size="6" id="selectedIndicators" name="selectedIndicators" style="min-width:600px" ondblclick="moveSelectedById( 'selectedIndicators', 'availableIndicators' )">
+ #foreach( $indicator in $selectedIndicators )
+ <option value="$indicator.id">$indicator.name</option>
+ #end
+ </select>
+ </td>
+ <td>
+ <a href="#" onclick="moveUpSelectedOption( 'selectedIndicators' )"><img src="../images/move_up.png" border="0" alt=""></a><br><br>
+ <a href="#" onclick="moveDownSelectedOption( 'selectedIndicators' )"><img src="../images/move_down.png" border="0" alt=""></a>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2" style="height:15px"></td>
+ </tr>
+
+ <!-- Category -->
+
+ #if ( $dimension == "period" )
+ #parse( "dhis-web-reporting/addChartPeriodModeForm.vm" )
+ #else
+ #parse( "dhis-web-reporting/addChartOrganisationUnitModeForm.vm" )
+ #end
+
+ <tr>
+ <td colspan="2" style="height:15px"></td>
+ </tr>
+
+</table>
+
+</form>
