fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ga update

Browse Source
This commit is contained in:
Dante
2015-07-23 17:43:02 -04:00
parent ad87f55dff
commit e316f48dce
7 changed files with 61 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gulliver/js/pmchart/pmCharts.js
View File

File diff suppressed because one or more lines are too long

2
workflow/engine/classes/class.indicatorsCalculator.php
View File

@@ -653,7 +653,7 @@ class indicatorsCalculator
G::loadClass('wsTools'); G::loadClass('wsTools');
$currentWS = defined('SYS_SYS') ? SYS_SYS : 'Wokspace Undefined'; $currentWS = defined('SYS_SYS') ? SYS_SYS : 'Wokspace Undefined';
$workSpace = new workspaceTools($currentWS); $workSpace = new workspaceTools($currentWS);
$arrayHost = explode(":", $workSpace->dbHost); $arrayHost = split(":", $workSpace->dbHost);
$host = "host=".$arrayHost[0]; $host = "host=".$arrayHost[0];
$port = count($arrayHost) > 1 ? ";port=".$arrayHost[1] : ""; $port = count($arrayHost) > 1 ? ";port=".$arrayHost[1] : "";
$db = ";dbname=".$workSpace->dbName; $db = ";dbname=".$workSpace->dbName;

3
workflow/engine/js/strategicDashboard/timeSeriesView.js
View File

@@ -17,7 +17,7 @@ $(document).ready(function() {
$('#compareButton').click(function(){ $('#compareButton').click(function(){
$('#comparisonBreadcrumb').find('li').remove() $('#comparisonBreadcrumb').find('li').remove()
$('#comparisonBreadcrumb') $('#comparisonBreadcrumb')
.append ('<li><a class="bread-back-selector2" href="#"><i class="fa fa-chevron-left fa-fw"></i>Return to Indicator View</a>'); .append ('<li><a class="bread-back-selector2" href="#"><i class="fa fa-chevron-left fa-fw"></i>Return to the Indicator\'s View</a>');
tsPresenter.historicData( tsPresenter.historicData(
$('#indicatorList').val(), $('#indicatorList').val(),
$('#periodicityList').val(), $('#periodicityList').val(),
@@ -63,7 +63,6 @@ $(document).ready(function() {
}); });
}); });
var bindTimeSeriesLists = function (presenter, elementsToConserve) { var bindTimeSeriesLists = function (presenter, elementsToConserve) {
var conserveStates =[]; var conserveStates =[];

1
workflow/engine/js/strategicDashboard/viewDashboardPresenter.js
View File

@@ -219,7 +219,6 @@ ViewDashboardPresenter.prototype.setStatusButtonWidthsAndDisplayValues = functio
break; break;
} }
var widthToDivide = 100 - barsLessThanMin.length * minPercent; var widthToDivide = 100 - barsLessThanMin.length * minPercent;
var normalsSum = 0; var normalsSum = 0;
$.each (barsNormal, function() { $.each (barsNormal, function() {

1
workflow/engine/js/strategicDashboard/viewDashboardView.js
View File

@@ -869,6 +869,7 @@ var fillGeneralIndicatorFirstView = function (presenterData) {
area: {visible: false, css:"area"}, area: {visible: false, css:"area"},
axisX:{ showAxis: true, label: G_STRING.ID_PROCESS_TASKS }, axisX:{ showAxis: true, label: G_STRING.ID_PROCESS_TASKS },
axisY:{ showAxis: true, label: G_STRING.ID_TIME_HOURS }, axisY:{ showAxis: true, label: G_STRING.ID_TIME_HOURS },
marker:{ratio:5, css: "line-chart-point"},
showErrorBars: false showErrorBars: false
} }
}; };

16
workflow/engine/templates/strategicDashboard/viewDashboard.html
View File

@@ -363,7 +363,7 @@
<body id="page-top" class="index"> <body id="page-top" class="index">
<img id="scrollImg" class="floating" src="/images/scrolldown.gif" width="80" height="80" style="border-radius:85px; visibility:hidden;"/> <img id="scrollImg" class="floating" src="/images/scrolldown.gif" width="80" height="80" style="border-radius:85px; visibility:hidden;"/>
<div id="wrapper"> <div id="wrapper" style="background:#fff;">
<div id="page-wrapper"> <div id="page-wrapper">
<!--Cabezera--> <!--Cabezera-->
<div class="row"> <div class="row">
@@ -371,16 +371,14 @@
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-body"> <div class="panel-body">
<div class="span4 pull-left"> <div class="span4 pull-left">
<a class="btn btn-primary dashboard-button" data-toggle="collapse" href="#collapseExample" aria-expanded="false" aria-controls="collapseExample"> <a class="btn btn-primary dashboard-button" data-toggle="collapse" href="#collapseExample" aria-expanded="false" aria-controls="collapseExample">
<i class="fa fa-bar-chart fa-2x"></i> <i class="fa fa-bar-chart fa-2x"></i>
<i class="fa fa-chevron-down fa-1x"></i> <i class="fa fa-chevron-down fa-1x"></i>
</a> </a>
</div> </div>
<h4 id="titleH4" class="header-dashboard"></h4> <h4 id="titleH4" class="header-dashboard ellipsis" style="max-width:400px;"></h4>
<div class="pull-right dashboard-right container-fluid"> <div class="pull-right dashboard-right container-fluid">
<div id="compareIndicators" class="row pull-left"> <div id="compareIndicators" class="row pull-left">
<div class="span4 pull-left" style="margin:15px; "> <div class="span4 pull-left" style="margin:15px; ">
<span id="indicatorLabel"></span> <span id="indicatorLabel"></span>
<select id="indicatorList"></select> <select id="indicatorList"></select>

78
workflow/public_html/css/general.css
View File

@@ -62,20 +62,59 @@
.pie-label {font-size:10px;} .pie-label {font-size:10px;}
.axis-label {font-size:10px;}
.errorBar, .errorBarLowerMark, .errorBarUpperMark{ .errorBar, .errorBarLowerMark, .errorBarUpperMark{
stroke: blue; stroke: blue;
stroke-width: 1; stroke-width: 1;
} }
.x-ticks-label { .x-ticks-label {
font-size:9px; font-size:10px;
font-weight:normal;
stroke: #000;
fill: #000;
-webkit-filter: drop-shadow( 0px 0px 0px #000 );
filter: drop-shadow( 0px 0px 0px #000); /* Same syntax as box-shadow */
} }
.y-ticks-label { .y-ticks-label {
font-size:9px; font-size:10px;
font-weight:normal;
stroke: #000;
fill: #000;
} }
.axis-label {
font-size:12px;
font-weight:bold;
}
.line1 {
stroke: #A4B78A;
stroke-width: 3;
fill: none;
}
.line2 {
stroke: #eee;
stroke-width: 2;
fill: none;
}
.line-chart-point {
stroke:#006E2E;
fill: #006E2E;
opacity:0.8;
-webkit-filter: drop-shadow( -2px -2px 2px #000 );
filter: drop-shadow( -2px -2px 2px #000); /* Same syntax as box-shadow */
}
.chart-background {
background:#fff;
}
.das-title-selector { .das-title-selector {
width:160px; width:160px;
text-overflow: ellipsis; text-overflow: ellipsis;
@@ -641,12 +680,6 @@ img#topright { top:0; right:0; }
opacity: 0.9; opacity: 0.9;
} }
path.line1 {
stroke: steelblue;
stroke-width: 1;
fill: none;
shape-rendering: auto;
}
.axis path, .axis path,
.axis line { .axis line {
@@ -688,18 +721,18 @@ img#topright { top:0; right:0; }
.tick { .tick {
stroke:blue; stroke:blue;
stroke-opacity: 0.3; /*stroke-opacity: 0.3;*/
font-size:12px; font-size:10px;
font-family:arial; font-family:arial;
/*font-weight:normal;*/ font-weight:normal;
/*text-shadow:1px 1px 1px #000;*/ /*text-shadow:1px 1px 1px #000;*/
} }
.tick :Hover{ .tick :Hover{
stroke:red; stroke:#aaa;
stroke-opacity: 0.3; /*stroke-opacity: 0.3;*/
font-size:12px; font-size:10px;
font-family:arial; font-family:arial;
/*font-weight:normal;*/ font-weight:normal;
} }
@@ -730,17 +763,6 @@ text.shadow {
opacity: 0.9; opacity: 0.9;
} }
.line1 {
stroke: steelblue;
stroke-width: 2;
fill: none;
}
.line2 {
stroke: #eee;
stroke-width: 2;
fill: none;
}
.axis path, .axis path,
.axis line { .axis line {