dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 12476
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-10-07 16:00:59 +0200
message:
  Data entry, impl option for printing form with values and without values
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/form.js
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.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	2013-07-08 09:46:51 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties	2013-10-07 14:00:59 +0000
@@ -103,5 +103,7 @@
 no_periods_click_prev_year_button=No periods, click "Prev year" button
 print=Print
 view_comment=View comment
-validation_rules_are_being_processed_please_wait = Validation rules are being processed, please wait ...
-section = Section
\ No newline at end of file
+validation_rules_are_being_processed_please_wait=Validation rules are being processed, please wait
+section=Section
+print_form=Print form
+print_blank_form=Print blank form

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2013-09-30 15:52:24 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2013-10-07 14:00:59 +0000
@@ -2424,3 +2424,14 @@
             input.focus();
         } );
 }
+
+// -----------------------------------------------------------------------------
+// Various
+// -----------------------------------------------------------------------------
+
+function printBlankForm()
+{
+	$( '#contentDiv input, select' ).css( 'display', 'none' );
+	window.print();
+	$( '#contentDiv input, select' ).css( 'display', '' );	
+}

=== 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	2013-10-07 13:47:28 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm	2013-10-07 14:00:59 +0000
@@ -51,10 +51,6 @@
 #moduleHeader, #currentSelection, #actions, #selectionBox, #completenessDiv, .ui-helper-hidden-accessible {
     display: none;
 }
-
-#contentDiv input, select {
-    display: none;
-}
 </style>
 
 <h3 id="moduleHeader">$i18n.getString( "data_entry" ) #openHelp( "dataEntry" )</h3>
@@ -67,7 +63,8 @@
 
 <div id="actions">	
     <input type="button" value="$i18n.getString( 'run_validation' )" onclick="validate( false )" id="validationButton" style="width:120px;" disabled="disabled"/><br>
-    <input type="button" value="$i18n.getString( 'print' )" onclick="window.print()" id="printButton" style="width:120px"/>
+    <input type="button" value="$i18n.getString( 'print_form' )" onclick="window.print()" id="printButton" style="width:120px"/><br>
+    <input type="button" value="$i18n.getString( 'print_blank_form' )" onclick="printBlankForm()" style="width:120px"/><br>                                                                                                                      </br>
 </div>
 
 <div id="selectionBox" class="inputCriteria" style="width:534px">