dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #30349
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 15404: Approval, added missing states to approval report UI.
------------------------------------------------------------
revno: 15404
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-05-26 12:46:17 +0200
message:
Approval, added missing states to approval report UI.
modified:
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataApprovalForm.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataApproval.js
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderDataSetReportHeader.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/style/dhis-web-reporting.css
--
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-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties 2014-05-04 21:36:18 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties 2014-05-26 10:46:17 +0000
@@ -257,6 +257,10 @@
approved=Approved
approved_and_accepted=Approved and accepted
ready_for_approval=Ready for approval
+approval_not_relevant=Approval not relevant
+waiting_for_approval_elsewhere=Waiting for approval elsewhere
+approved_elsewhere=Approved elsewhere
+accepted_elsewhere=Accepted elsewhere
confirm_approval=Are you sure you want to approve this data set?
confirm_unapproval=Are you sure you want to unapprove this data set?
confirm_accept=Are you sure you want to accept this data set approval?
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataApprovalForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataApprovalForm.vm 2014-04-11 11:58:36 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataApprovalForm.vm 2014-05-26 10:46:17 +0000
@@ -9,7 +9,11 @@
var i18n_select_option_view_all = '$encoder.jsEscape( $i18n.getString( "select_option_view_all" ) , "'")';
var i18n_waiting_for_lower_level_approval = '$encoder.jsEscape( $i18n.getString( "waiting_for_lower_level_approval" ) , "'")';
var i18n_ready_for_approval = '$encoder.jsEscape( $i18n.getString( "ready_for_approval" ) , "'")';
+var i18n_approval_not_relevant = '$encoder.jsEscape( $i18n.getString( "approval_not_relevant" ) , "'")';
+var i18n_waiting_for_approval_elsewhere = '$encoder.jsEscape( $i18n.getString( "waiting_for_approval_elsewhere" ) , "'")';
var i18n_approved = '$encoder.jsEscape( $i18n.getString( "approved" ) , "'")';
+var i18n_approved_elsewhere = '$encoder.jsEscape( $i18n.getString( "approved_elsewhere" ) , "'")';
+var i18n_accepted_elsewhere = '$encoder.jsEscape( $i18n.getString( "accepted_elsewhere" ) , "'")';
var i18n_approved_and_accepted = '$encoder.jsEscape( $i18n.getString( "approved_and_accepted" ) , "'")';
var i18n_confirm_approval = '$encoder.jsEscape( $i18n.getString( "confirm_approval" ) , "'")';
var i18n_confirm_unapproval = '$encoder.jsEscape( $i18n.getString( "confirm_unapproval" ) , "'")';
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataApproval.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataApproval.js 2014-04-20 16:15:45 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataApproval.js 2014-05-26 10:46:17 +0000
@@ -143,10 +143,18 @@
$( ".approveButton" ).hide();
switch ( json.state ) {
+ case "UNAPPROVABLE":
+ $( "#approvalNotification" ).html( i18n_approval_not_relevant );
+ break;
+
case "UNAPPROVED_WAITING":
$( "#approvalNotification" ).html( i18n_waiting_for_lower_level_approval );
break;
+ case "UNAPPROVED_ELSEWHERE":
+ $( "#approvalNotification" ).html( i18n_waiting_for_approval_elsewhere );
+ break;
+
case "UNAPPROVED_READY":
$( "#approvalNotification" ).html( i18n_ready_for_approval );
@@ -172,6 +180,10 @@
break;
+ case "APPROVED_ELSEWHERE":
+ $( "#approvalNotification" ).html( i18n_approved_elsewhere );
+ break;
+
case "ACCEPTED_HERE":
$( "#approvalNotification" ).html( i18n_approved_and_accepted );
@@ -186,7 +198,12 @@
}
break;
+
+ case "ACCEPTED_ELSEWHERE":
+ $( "#approvalNotification" ).html( i18n_accepted_elsewhere );
+ break;
}
+
} );
}
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderDataSetReportHeader.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderDataSetReportHeader.vm 2014-04-03 19:02:51 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderDataSetReportHeader.vm 2014-05-26 10:46:17 +0000
@@ -6,7 +6,7 @@
<h3>$encoder.htmlEncode( $selectedOrgunit.name ) - $format.formatPeriod( $selectedPeriod )</h3>
-#if( $registration )<div style="margin-bottom:6px">$i18n.getString( "completed_by" ): <a href="javascript:setUserInfo( '${registration.storedBy}' )">${registration.storedBy}</a></div>#end
+#if( $registration )<div style="margin-bottom:6px">$i18n.getString( "completed_by" ): <a href="javascript:setUserInfo( '$!{registration.storedBy}' )">${registration.storedBy}</a></div>#end
<div id="shareForm">
<textarea id="interpretationArea" class="interpretationArea" placeholder="$i18n.getString( 'write_your_interpretation_of_report' )"></textarea><br>
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/style/dhis-web-reporting.css'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/style/dhis-web-reporting.css 2014-04-02 14:21:37 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/style/dhis-web-reporting.css 2014-05-26 10:46:17 +0000
@@ -26,7 +26,7 @@
width: auto;
display: inline-block;
vertical-align: top;
- margin-left: 15px;
+ margin-left: 10px;
}
@media print
