dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #18954
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 8075: WIP dynamic cde fields
------------------------------------------------------------
revno: 8075
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-09-13 16:34:32 +0200
message:
WIP dynamic cde fields
modified:
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/viewDataEntryForm.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm
resources/sql/div.sql
--
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-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties 2012-09-13 06:44:04 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties 2012-09-13 14:34:32 +0000
@@ -100,4 +100,5 @@
unregister_complete_failed_dataset_is_locked=Data set is locked, un-registration failed, please contact admin
dataelement_with_id=Data element with identifier
category_option_combo_with_id=Category option combination identifier
-does_not_exist=does not exist
\ No newline at end of file
+does_not_exist=does not exist
+insert_input_fields_into_the_form=Insert input fields into the form
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties 2012-09-12 20:07:46 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties 2012-09-13 14:34:32 +0000
@@ -94,4 +94,5 @@
select_category_combo=Select category combination
start=Start
insert_data_element_drop_down=Insert data element drop-down
-select_category_combo_for_which_to_insert=Select category combination for which to insert dynamic fields
\ No newline at end of file
+select_category_combo_for_which_to_insert=Select category combination for which to insert dynamic fields
+insert_input_fields_into_the_form=Insert input fields into the form
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/viewDataEntryForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/viewDataEntryForm.js 2012-09-12 20:07:46 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/viewDataEntryForm.js 2012-09-13 14:34:32 +0000
@@ -22,16 +22,12 @@
dataElementSelector.height( dialog.height() - 97 );
totalSelector.height( dialog.height() - 97 );
indicatorSelector.height( dialog.height() - 97 );
- dynamicElementSelector.height( dialog.height() - 97 );
+ dynamicElementSelector.height( dialog.height() - 120 );
});
$(":button").button();
$(":submit").button();
- //$("#dataElementInsertButton").click(insertDataElement); //TODO remove?
- //$("#totalInsertButton").click(insertTotal); //TODO remove?
- //$("#indicatorInsertButton").click(insertIndicator); //TODO remove?
-
$("#selectionDialog").bind("dialogopen", function(event, ui) {
$("#insertDataElementsButton").button("disable");
});
@@ -403,7 +399,7 @@
clearListById( "dynamicElementSelector" );
var optionCombos = $.getJSON( "../api/categoryCombos/" + categoryComboUid + ".json", function( json ) {
- $.each( json.categoryOptionCombo, function( index, value ) {
+ $.each( json.categoryOptionCombos, function( index, value ) {
addOptionById( "dynamicElementSelector", value.id, value.name );
} );
} );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm 2012-09-12 20:07:46 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm 2012-09-13 14:34:32 +0000
@@ -130,17 +130,18 @@
</tr>
<tr id="dynamicElementsTab">
<td>
- <div id="dynamicElementSelect">
- <span style="color:#555;">$i18n.getString( "select_category_combo_for_which_to_insert" )</span>
- <select id="categoryComboSelect" style="width: 100%; margin-bottom: 10px;">
- #foreach( $categoryCombo in $categoryCombos )
- <option value="$categoryCombo.uid">$encoder.htmlEncode( $categoryCombo.name )</option>
- #end
- </select><br>
- <button type="button" id="startButton">$i18n.getString( "start" )</button>
+ <div id="dynamicElementSelect" style="margin-bottom: 10px;">
+ <div style="color:#666; margin-top:5px; margin-bottom:5px;">$i18n.getString( "select_category_combo_for_which_to_insert" )</div>
+ <select id="categoryComboSelect" style="width: 100%; margin-bottom: 10px;">
+ #foreach( $categoryCombo in $categoryCombos )
+ <option value="$categoryCombo.uid">$encoder.htmlEncode( $categoryCombo.name )</option>
+ #end
+ </select><br>
+ <button type="button" id="startButton">$i18n.getString( "start" )</button>
</div>
<div id="dynamicElementInsert" style="margin-bottom: 10px; display:none;">
- <select id="dynamicElementSelector" multiple="multiple" style="height: 150px; margin-bottom: 10px; width: 100%;"></select><br>
+ <div style="color:#666; margin-top:5px; margin-bottom:5px;">$i18n.getString( "insert_input_fields_into_the_form" )</div>
+ <select id="dynamicElementSelector" multiple="multiple" style="height: 177px; margin-bottom: 10px; width: 100%;"></select><br>
<button type="button" id="insertDynamicElementButton">$i18n.getString( "insert_data_element_drop_down" )</button>
<button type="button" id="doneButton">$i18n.getString( "done" )</button>
</div>
=== modified file 'resources/sql/div.sql'
--- resources/sql/div.sql 2012-07-23 12:33:49 +0000
+++ resources/sql/div.sql 2012-09-13 14:34:32 +0000
@@ -57,7 +57,7 @@
where ou.organisationunitid=om.organisationunitid
and om.orgunitgroupid=22755);
--- Facility overview --
+-- Facility overview
select distinct ous.idlevel5 as internalid, ou.uid, ou.code, ou.name, ougs.type, ougs.ownership,
ou2.name as province, ou3.name as county, ou4.name as district, ou.coordinates as longitide_latitude
@@ -70,6 +70,6 @@
where ous.level=5
order by province, county, district, ou.name;
--- Compare user roles --
+-- Compare user roles
-select authority from userroleauthorities where userroleid=49836 and authority not in (select authority from userroleauthorities where userroleid=83722);
+select authority from userroleauthorities where userroleid=33706 and authority not in (select authority from userroleauthorities where userroleid=21504);
