fernando/luos
1
0
Fork 0
Code Releases Activity

View Refactoring and new status indicator display

Browse Source
This commit is contained in:
Dante
2015-04-17 15:08:04 -04:00
parent c844438322
commit 8927c51cf9
8 changed files with 379 additions and 1771 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -109,6 +109,7 @@ BarChart.prototype.drawBars = function(data, canvas, param) {
var currObj = this;
if (data == null || data.length == 0) {
console.log(graphDim);
canvas.append("text")
.attr('class','pm-charts-no-draw')
.attr("y", graphDim.height/2)
@@ -1385,6 +1386,7 @@ PieChart.prototype.drawPie2D = function (dataset, canvas, param) {
.enter()
.append("text")
.attr("x", width + 30)
.attr("class", "legend")
.text(function (d, i) {
return (d.datalabel + "-" + getPercent(d.value))
})

1237
workflow/engine/js/strategicDashboard/dashboard.js
View File

File diff suppressed because it is too large Load Diff

500
workflow/engine/js/strategicDashboard/dashboardProxy.js
View File

File diff suppressed because it is too large Load Diff

8
workflow/engine/src/ProcessMaker/BusinessModel/ReportingIndicators.php
View File

@@ -30,7 +30,9 @@ class ReportingIndicators
$peiCost = current(reset($calculator->peiCostHistoric($processesId, $measureDate, $measureDate, \ReportingPeriodicityEnum::NONE)));
$peiCompare = current(reset($calculator->peiHistoric($processesId, $compareDate, $compareDate, \ReportingPeriodicityEnum::NONE)));
$retval = array("efficiencyIndex" => $peiValue,
$retval = array(
"id" => $indicatorUid,
"efficiencyIndex" => $peiValue,
"efficiencyVariation" => ($peiValue-$peiCompare),
"inefficiencyCost" => $peiCost,
"data"=>$processes);
@@ -72,7 +74,9 @@ class ReportingIndicators
$ueiCompare = current(reset($calculator->ueiHistoric(null, $compareDate, $compareDate, \ReportingPeriodicityEnum::NONE)));
$retval = array("efficiencyIndex" => $ueiValue,
$retval = array(
"id" => $indicatorUid,
"efficiencyIndex" => $ueiValue,
"efficiencyVariation" => ($ueiValue-$ueiCompare),
"inefficiencyCost" => $ueiCost,
"data"=>$groups);

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

File diff suppressed because it is too large Load Diff

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

@@ -1,4 +1,6 @@
.pm-charts-no-draw {
font-size:16px;
font-family:"Arial";
@@ -11,10 +13,56 @@
color:#e14333;
}
.status-graph-title-low,
.status-graph-title-medium,
.status-graph-title-high {
text-align:center;
font-size:17px;
font-family: 'Chivo', sans-serif;
width:90%;
margin:0 auto;
border:1px solid #eaeaea;
margin-top:10px;
border-radius: 5px;
}
.status-graph-title-low {
background-color: #e14333;
}
.status-graph-title-medium {
background-color:#fada5e;
}
.status-graph-title-high {
background-color:#1fbc99;
}
.status-indicator-low,
.status-indicator-medium,
.status-indicator-high {
padding:0px;
padding-top:30px;
color:#444;
float:left;
}
.section-title {
}
.status-indicator-low {
background-color: #e14333;
}
.status-indicator-medium {
background-color: #fada5e;
}
.status-indicator-high {
background-color: #1fbc99;
}
.hideme {opacity:0;}
.pie-label {font-size:10px;}
.axis-label {font-size:10px;}
.errorBar, .errorBarLowerMark, .errorBarUpperMark{
@@ -29,15 +77,34 @@
font-size:9px;
}
.das-title-selector {
width:160px;
text-overflow: ellipsis;
white-space: nowrap;
overflow:hidden;
}
.ind-title-selector {
text-overflow: ellipsis;
white-space: nowrap;
overflow:hidden;
}
.ellipsis {
text-overflow: ellipsis;
white-space: nowrap;
overflow:hidden;
}
img.floating {
position:fixed;
right:0;
bottom:0;
margin:0;
padding:0;
z-index:1000;
opacity: 0.9;
filter: alpha(opacity=90);
position:fixed;
right:0;
bottom:0;
margin:0;
padding:0;
z-index:1000;
opacity: 0.9;
filter: alpha(opacity=90);
}

3
workflow/public_html/css/gridstack.css
View File

@@ -103,7 +103,7 @@
width: auto !important;
left: 0 !important;
top: auto !important;
margin-bottom: 20px;
margin-bottom:20px;
}
.grid-stack {
@@ -127,3 +127,4 @@
-o-transition: left .0s, top .0s, height .0s, width .0s;
transition: left .0s, top .0s, height .0s, width .0s;
}

23
workflow/public_html/css/sb-admin-2.css
View File

@@ -348,21 +348,21 @@ table.dataTable thead .sorting:after {
text-decoration: none;
}
.panel-yellow {
.panel-high {
border-color: #ddd;
}
.panel-yellow .panel-heading {
.panel-high .panel-heading {
border-color: #fcb322;
color: #fff;
background-color: #fcb322;
}
.panel-yellow a {
.panel-high a {
color: #606368;
}
.panel-yellow a:hover {
.panel-high a:hover {
color: #fcb322;
text-decoration: none;
}
@@ -520,15 +520,15 @@ table.dataTable thead .sorting:after {
/*title panel ends*/
.panel-primary{
.panel-low{
border-color: #ddd;
}
.panel-primary a{
.panel-low a{
color: #606368;
}
.panel-primary a:hover{
.panel-low a:hover{
color: #3397e1;
text-decoration: none;
}
@@ -549,7 +549,7 @@ table.dataTable thead .sorting:after {
margin-bottom: 20px;
}
.panel-green:hover, .panel-red:hover, .panel-yellow:hover, .panel-primary:hover{
.panel-green:hover, .panel-red:hover, .panel-high:hover, .panel-low:hover{
box-shadow:0px 3px 2px #dfdfdf;
}
@@ -566,7 +566,7 @@ table.dataTable thead .sorting:after {
}
.panel-active{
background-color: #fff;
background-color: #000;
position: relative;
}
@@ -583,6 +583,7 @@ table.dataTable thead .sorting:after {
.panel-active:after {
border-color: rgba(136, 183, 213, 0);
background-color: #000;
border-top-color: #fff;
border-width: 20px;
margin-left: -20px;
@@ -614,11 +615,11 @@ table.dataTable thead .sorting:after {
margin-top:10px;
}
.panel-red .panel-heading, .panel-primary .panel-heading{
.panel-red .panel-heading, .panel-low .panel-heading{
color:rgba(0,0,0,0.4) !important;
}
.panel-yellow .progress-bar{
.panel-high .progress-bar{
background: #fcb322;
}