------------------------------------------------------------
revno: 2416
committer: tranthanhtri <tranthanh...@tranthanhtri-pc>
branch nick: trunk
timestamp: Fri 2010-10-22 17:11:39 +0700
message:
fixed bug 663711: Idicator - numerator ad denom. edit window
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValue.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/DefaultDataValueService.java
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/ui/css/redmond/jquery-ui.css
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorExpressionBuilderForm.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-api/src/main/java/org/hisp/dhis/datavalue/DataValue.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValue.java 2010-05-12 13:38:28 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValue.java 2010-10-22 10:11:39 +0000
@@ -52,6 +52,9 @@
public static final String TRUE = "true";
public static final String FALSE = "false";
+
+
+
/**
* Part of the DataValue's composite ID
*/
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/DefaultDataValueService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/DefaultDataValueService.java 2010-05-06 16:05:43 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/DefaultDataValueService.java 2010-10-22 10:11:39 +0000
@@ -83,6 +83,7 @@
{
log.info( "DataValue was ignored as zero values are insignificant for this data element: "
+ dataValue.getDataElement() );
+
}
else
{
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/ui/css/redmond/jquery-ui.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/ui/css/redmond/jquery-ui.css 2010-09-08 10:40:26 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/ui/css/redmond/jquery-ui.css 2010-10-22 10:11:39 +0000
@@ -642,12 +642,12 @@
.ui-accordion .ui-accordion-content-active { display: block; }/* Dialog
----------------------------------*/
.ui-dialog { position: relative; padding: .2em; width: 300px; }
-.ui-dialog .ui-dialog-titlebar { padding: .5em .3em .3em 1em; position: relative; }
-.ui-dialog .ui-dialog-title { float: left; margin: .1em 0 .2em; }
+.ui-dialog .ui-dialog-titlebar { padding: 0.1em 0.1em 0.1em 1em; position: relative; }
+.ui-dialog .ui-dialog-title { float: left; margin: .1em 0 .2em; font-size:10pt}
.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
-.ui-dialog .ui-dialog-content { border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1;}
+.ui-dialog .ui-dialog-content { border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; font-size: 10pt; text-align:left}
.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
.ui-dialog .ui-dialog-buttonpane button { float: right; margin: .5em .4em .5em 0; cursor: pointer; padding: .2em .6em .3em .6em; line-height: 1.4em; width:auto; overflow:visible; }
.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorExpressionBuilderForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorExpressionBuilderForm.vm 2010-09-21 06:16:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorExpressionBuilderForm.vm 2010-10-22 10:11:39 +0000
@@ -1,4 +1,4 @@
-<div id="indicator-expression-container" style="display:none">
+<div id="indicator-expression-container">
<form id="indicator-expression-form">
<table width="750">
<colgroup>
@@ -72,8 +72,24 @@
<script>
+
+
var numerator = false;
var validator = null;
+ var dialog = null;
+
+ jQuery(function(){
+ dialog = jQuery("#indicator-expression-container").dialog({
+ modal: true,
+ autoOpen:false,
+ minWidth: 770,
+ minHeight: 500,
+ width:770,
+ height:500
+ });
+
+ getOperandsByDataElementGroup();
+ });
function indicatorNumeratorForm()
{
@@ -92,8 +108,9 @@
checAggregationOperator();
getExpressionText();
+ dialog.dialog("option", "title", "$i18n.getString( 'edit_numerator' )");
+ dialog.dialog( "open");
- showPopupWindowById( 'indicator-expression-container', 750, 440 );
}
function indicatorDenominatorForm()
@@ -114,7 +131,8 @@
checAggregationOperator();
getExpressionText();
- showPopupWindowById( 'indicator-expression-container', 750, 440 );
+ dialog.dialog("option", "title", "$i18n.getString( 'edit_denominator' )");
+ dialog.dialog( "open");
}
function getOperandsByDataElementGroup()
@@ -170,8 +188,7 @@
function closeExpressionBuilder()
{
- hideById( 'indicator-expression-container' );
- unLockScreen();
+ dialog.dialog( "close" );
}
function insertExpression()
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
