diff --git a/workflow/engine/classes/class.dashletOpenVSCompleted.php b/workflow/engine/classes/class.dashletOpenVSCompleted.php index 93bbabbbe..4d615ef5a 100644 --- a/workflow/engine/classes/class.dashletOpenVSCompleted.php +++ b/workflow/engine/classes/class.dashletOpenVSCompleted.php @@ -38,20 +38,19 @@ Array $con = Propel::getConnection("workflow"); $stmt = $con->createStatement(); $sql = "select count(*) as CANT from APPLICATION where APP_STATUS = 'TO_DO' "; - $rs1 = $stmt->executeQuery($sql, ResultSet::FETCHMODE_NUM); - $rs1->next(); - $row = $rs1->getRow(); + $rs = $stmt->executeQuery($sql, ResultSet::FETCHMODE_ASSOC); + $rs->next(); + $row = $rs->getRow(); $casesTodo = $row['CANT']; $stmt = $con->createStatement(); $sql = "select count(*) as CANT from APPLICATION where APP_STATUS = 'COMPLETED' "; - $rs1 = $stmt->executeQuery($sql, ResultSet::FETCHMODE_NUM); - $rs1->next(); - $row = $rs1->getRow(); + $rs = $stmt->executeQuery($sql, ResultSet::FETCHMODE_ASSOC); + $rs->next(); + $row = $rs->getRow(); $casesCompleted = $row['CANT']; - if ( $casesCompleted + $casesTodo != 0 ) { - $this->value = $casesTodo / ($casesCompleted + $casesTodo); + $this->value = $casesTodo / ($casesCompleted + $casesTodo)*100; } else { $this->value = 0; @@ -64,7 +63,7 @@ Array $g = new pmGauge(); $g->w = $width; $g->value = $this->value; - //$g->maxValue = $this->value + 5; //default 100 is ok, + $g->maxValue = 100; $g->render(); } diff --git a/workflow/engine/classes/class.pmGauge.php b/workflow/engine/classes/class.pmGauge.php index d13037ca5..669b8cea9 100755 --- a/workflow/engine/classes/class.pmGauge.php +++ b/workflow/engine/classes/class.pmGauge.php @@ -91,10 +91,10 @@ imagefilledellipse($im, $cX, $cY, $dXRing, $dYRing, $bgcolor); //drawing the red arc - if ( $this->redFrom > $maxValue ) $this->redFrom = $maxValue; - if ( $this->redTo > $maxValue ) $this->redTo = $maxValue; - if ( $this->yellowFrom > $maxValue ) $this->yellowFrom = $maxValue; - if ( $this->yellowTo > $maxValue ) $this->yellowTo = $maxValue; + if ( $this->redFrom > $this->maxValue ) $this->redFrom = $this->maxValue; + if ( $this->redTo > $this->maxValue ) $this->redTo = $this->maxValue; + if ( $this->yellowFrom > $this->maxValue ) $this->yellowFrom = $this->maxValue; + if ( $this->yellowTo > $this->maxValue ) $this->yellowTo = $this->maxValue; $redFrom = $this->redFrom/$this->maxValue*300 - 240 ; $redTo = $this->redTo/$this->maxValue*300 - 240; diff --git a/workflow/engine/templates/dashboard/index.js b/workflow/engine/templates/dashboard/index.js index 500b48dac..896afbfd8 100644 --- a/workflow/engine/templates/dashboard/index.js +++ b/workflow/engine/templates/dashboard/index.js @@ -84,39 +84,6 @@ Ext.onReady(function(){ } }); - var vp = Ext.getCmp('viewportDashboard'); - var pd = Ext.getCmp('portalDashboard'); - pd.items.items[0].add( np ); - pd.doLayout(); - //vp.doLayout(); - } - }, - { - xtype: 'tbbutton', - text : 'new trend graph', - handler : function(a) { - var np = new Ext.ux.Portlet ( { - //title: 'Panel nuevo', - tools: tools, - html: 'hello world', - listeners: { - 'render': function(p){ - p.html = 'hello ' + p.getWidth(); - }, - 'move' : function(p){ - Ext.Msg.alert('Portlet ', 'move ' + p.getWidth() ); - p.html = 'show ' + p.getWidth(); - }, - 'resize' : function(p,w,h){ - var randomnumber=Math.floor(Math.random()*1000000) - var img = new Ext.XTemplate("").apply({ - page: 'http://javaserver.colosa.net/ext/examples/portal/history.php', width:w, random: randomnumber }) - - p.update(img ); - } - } - }); - var vp = Ext.getCmp('viewportDashboard'); var pd = Ext.getCmp('portalDashboard'); pd.items.items[0].add( np );