dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #06645
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1840: forrmatting section layout in data entry
------------------------------------------------------------
revno: 1840
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: trunk
timestamp: Mon 2010-07-12 17:24:04 +0200
message:
forrmatting section layout in data entry
modified:
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/webapp/dhis-web-dataentry/javascript/section.js
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/section/dataElement.vm
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/section/form.vm
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm
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/editSection.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/greySection.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionDataElement.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionMultiDimensionalDataElement.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-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 2010-07-07 10:22:14 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties 2010-07-12 15:24:04 +0000
@@ -1,3 +1,5 @@
+open_entry_form = Open Entry Form
+hide_entry_form = Hide Entry Form
available_sections = Available Sections
value_type = Value Type
value_date = Value Date
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/section.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/section.js 2010-07-07 10:56:07 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/section.js 2010-07-12 15:24:04 +0000
@@ -1,15 +1,16 @@
function openCloseSection( sectionId )
{
- var divSection = document.getElementById( sectionId );
+ var divSection = document.getElementById( sectionId );
+ var sectionLabel = document.getElementById( sectionId + ":title" );
if( divSection.style.display == 'none' )
- {
- //window.location = "sectionform.action?selectedSectionId=" + sectionId;
+ {
divSection.style.display = ('block');
+ sectionLabel.style.textAlign = 'center';
}
else
- {
- //window.location = "sectionform.action?selectedSectionId=" + '';
+ {
divSection.style.display = ('none');
+ sectionLabel.style.textAlign = 'left';
}
}
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/section/dataElement.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/section/dataElement.vm 2010-07-07 10:56:07 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/section/dataElement.vm 2010-07-12 15:24:04 +0000
@@ -118,9 +118,7 @@
#set( $zeroValueSaveMode = true )
<input name="entryfield" id="$dataEntryId" type="text" value="$!encoder.htmlEncode( $dataValue.value )" #if( $auth.hasAccess( "dhis-web-dataentry", "saveValue") ) onchange="saveValue( $dataElement.id, $optionComboId, '$encoder.jsEncode( $dataElement.name )', $zeroValueSaveMode )" ondblclick="viewHistory( $dataElement.id, $optionComboId, true )" #else disabled="disabled" #end onkeypress="return keyPress(event, this)" style="width:100% #if( $minMaxError ) ;background-color:#ffcccc #end #if( $dataElement.type == "int" ) ;text-align:center #end" tabindex="$tabIndex" #if( $locked ) disabled="disabled"#end #if( $greyedField == "true" ) disabled="disabled"#end>
#end
- #end
-
-
+ #end
#set( $minMaxError = false )
#if( $dataElement.type == "int" && $dataValue && $minMax )
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/section/form.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/section/form.vm 2010-06-23 12:06:35 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/section/form.vm 2010-07-12 15:24:04 +0000
@@ -1,29 +1,45 @@
#parse( "/dhis-web-dataentry/select.vm" )
-<table class="mainPageTable">
-
-#set($i=1)
-
-#foreach( $section in $sections)
- <tr>
- <td><a href="javascript:openCloseSection($section.id);" style="text-decoration:none">$i - $encoder.htmlEncode($section.title)</a></td>
- </tr>
- <tr>
- <td>
- <div id="$section.id" style="border:thin solid; margin:0;display:none">
- #set( $isMultiDimensional = $sectionIsMultiDimensional.get( $section.id ) )
- #if($isMultiDimensional == true )
- #parse( "/dhis-web-dataentry/section/multiDimensionalDataElement.vm" )
- #else
- #parse( "/dhis-web-dataentry/section/dataElement.vm" )
- #end
- </div>
- </td>
- </tr>
- #set($i=$i+1)
+#set( $marker = 0 )
+
+#foreach( $section in $sections)
+
+ #if( $marker == 1 )
+ #set( $marker = 0 )
+
+ #else
+ #set( $marker = 1 )
+ #end
+
+ <div style="border:thin solid; #if( $marker == 0 ) background-color:#ebf0f6 #end">
+ <table class="mainPageTable">
+ <tr>
+ <td onclick="openCloseSection( $section.id )" onmouseover="style.backgroundColor='#baffbc';" onmouseout="#if( $marker == 0 ) style.backgroundColor='#ebf0f6' #else style.backgroundColor='#FFFFFF' #end">
+ <div id="$section.id:title" style="text-align:center"><h3>$encoder.htmlEncode( $section.title )</h3></div>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <div id="$section.id" style="display:block">
+
+ #set( $isMultiDimensional = $sectionIsMultiDimensional.get( $section.id ) )
+
+ #if($isMultiDimensional == true )
+ #parse( "/dhis-web-dataentry/section/multiDimensionalDataElement.vm" )
+ #else
+ #parse( "/dhis-web-dataentry/section/dataElement.vm" )
+ #end
+
+ </div>
+ </td>
+ </tr>
+ </table>
+ </div>
+
+ <br>
+
#end
-</table>
#parse( "/dhis-web-dataentry/completeRegistration.vm" )
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm 2010-06-27 15:47:33 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm 2010-07-12 15:24:04 +0000
@@ -75,3 +75,4 @@
</form>
<hr style="clear:both">
+<br>
=== 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 2010-07-07 10:22:14 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties 2010-07-12 15:24:04 +0000
@@ -12,7 +12,7 @@
manage_greyed_fields = Manage greyed fields
category_combo = Category combinations
add_dataset = Add dataset
-dataset_details = Dataset details
+dataset_details = Dataset Details
parent_dataset = Parent Dataset
name = Name
type = Type
@@ -73,7 +73,7 @@
group = Group
unselect_all_at_level = Unselect all at level
add_section = Add section
-section_details = Section details
+section_details = Section Details
selected_sections = Selected sections
available_sections = Available sections
add_dataset_section = Add dataset section
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editSection.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editSection.vm 2010-07-10 12:45:22 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editSection.vm 2010-07-12 15:24:04 +0000
@@ -110,7 +110,7 @@
<tr>
<td colspan="3">
<input type="submit" name="save" value="$i18n.getString( "save" )"><input type="button"
- onclick="window.location.href='dataSet.action'" value="$i18n.getString( "cancel" )">
+ onclick="window.location.href='section.action'" value="$i18n.getString( "cancel" )">
</td>
</tr>
</tbody>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/greySection.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/greySection.vm 2010-07-07 10:56:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/greySection.vm 2010-07-12 15:24:04 +0000
@@ -11,19 +11,19 @@
<tbody>
<tr>
<td><label>$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
- <td><input type="text" id="sectionName" name="sectionName" style="width:20em" value= "$section.name" disabled="disabled"></td>
+ <td><b>$section.name</b></td>
</tr>
<tr>
<td><label>$i18n.getString( "title" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
- <td><input type="text" id="sectionTitle" name="sectionTitle" style="width:20em" value="$section.title" disabled="disabled"></td>
+ <td><b>$section.title</b></td>
</tr>
<tr>
<td><label>$i18n.getString( "dataset" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
- <td><input type="text" style="width:20em" value="$section.dataSet.name" disabled="disabled"></td>
+ <td><b>$section.dataSet.name</b></td>
</tr>
<tr>
<td><label>$i18n.getString( "category_combo" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
- <td><input type="text" style="width:20em" value="$categoryCombo.name" disabled="disabled"></td>
+ <td><b>$categoryCombo.name</b></td>
</tr>
</tbody>
</table>
@@ -31,12 +31,18 @@
<hr style="clear:both">
<br>
-#if( $sectionIsMultiDimensional == "true" )
- #parse( "/dhis-web-maintenance-dataset/sectionMultiDimensionalDataElement.vm" )
-#else
- #parse( "/dhis-web-maintenance-dataset/sectionDataElement.vm" )
-#end
+<div style="border:1px solid #808080;width:98%">
+ #if( $sectionIsMultiDimensional == "true" )
+ #parse( "/dhis-web-maintenance-dataset/sectionMultiDimensionalDataElement.vm" )
+ #else
+ #parse( "/dhis-web-maintenance-dataset/sectionDataElement.vm" )
+ #end
+</div>
+<br>
+<hr style="clear:both">
+<br>
+
<p>
<input type="button" onclick="window.location.href='section.action'" value="$i18n.getString( "back" )">
</p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionDataElement.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionDataElement.vm 2010-07-07 10:56:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionDataElement.vm 2010-07-12 15:24:04 +0000
@@ -1,4 +1,3 @@
-<div style="border:1px solid #808080;width:98%">
<table class="mainPageTable" cellpadding="0">
<col id="noCol">
<col id="deCol">
@@ -54,5 +53,4 @@
</tr>
#end
-</table>
-</div>
\ No newline at end of file
+</table>
\ 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/sectionMultiDimensionalDataElement.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionMultiDimensionalDataElement.vm 2010-07-07 10:56:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionMultiDimensionalDataElement.vm 2010-07-12 15:24:04 +0000
@@ -1,4 +1,3 @@
-<div style="border:1px solid #808080;width:98%">
<table class="mainPageTable" cellpadding="0">
#set( $tabIndex = 1 )
#set( $colCount = $optionCombos.size() )
@@ -57,4 +56,3 @@
<tr></tr>
#end
</table>
-<div>
\ No newline at end of file
