Skip to content

Commit 1be0107

Browse files
DeepSee-like theme
1 parent 12ba70a commit 1be0107

File tree

4 files changed

+68
-13
lines changed

4 files changed

+68
-13
lines changed

source/css/LightPivot.css

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,4 +213,23 @@
213213

214214
.lpt tbody > tr > th {
215215
cursor: pointer;
216+
}
217+
218+
/* DeepSee theme */
219+
220+
.lpt {
221+
border-radius: 0;
222+
font-family: Arial, sans-serif;
223+
font-size: 10pt;
224+
}
225+
226+
.lpt table {
227+
border-collapse: collapse;
228+
}
229+
230+
.lpt .tableContainer th, .lpt .tableContainer td {
231+
box-shadow: none;
232+
border-radius: 0;
233+
padding: 3px 6px 3px 6px;
234+
border: 1px solid rgb(208, 208, 208);
216235
}

source/js/DataController.js

Lines changed: 31 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,30 @@ DataController.prototype.resetRawData = function () {
246246
data.info.leftHeaderColumnsNumber = yw;
247247
this.SUMMARY_SHOWN = false;
248248

249+
var countSummaryByColumn = function (array, iStart, iEnd, column) {
250+
var sum = 0;
251+
for (var i = iStart; i < iEnd; i++) {
252+
if (!isFinite(array[i][column]["value"])) {
253+
sum = 0;
254+
break;
255+
}
256+
sum += parseFloat(array[i][column]["value"]) || 0;
257+
}
258+
return sum || "";
259+
};
260+
261+
var countAverageByColumn = function (array, iStart, iEnd, column) {
262+
var sum = 0;
263+
for (var i = iStart; i < iEnd; i++) {
264+
if (!isFinite(array[i][column]["value"])) {
265+
sum = 0;
266+
break;
267+
}
268+
sum += parseFloat(array[i][column]["value"]) || 0;
269+
}
270+
return sum/(iEnd - iStart) || "";
271+
};
272+
249273
if (this.controller.CONFIG["showSummary"] && rawData.length - xh > 1 // xh - see above
250274
&& (rawData[rawData.length - 1][0] || {})["isCaption"]) {
251275
this.SUMMARY_SHOWN = true;
@@ -261,17 +285,13 @@ DataController.prototype.resetRawData = function () {
261285
}
262286
} else {
263287
summary[i] = {
264-
value: (function countSummaryByColumn(array, iStart, iEnd, column) {
265-
var sum = 0;
266-
for (var i = iStart; i < iEnd; i++) {
267-
if (!isFinite(array[i][column]["value"])) {
268-
sum = 0;
269-
break;
270-
}
271-
sum += parseFloat(array[i][column]["value"]) || 0;
272-
}
273-
return sum || "";
274-
})(rawData, xh, rawData.length - 1, i),
288+
// very hard workaround (applying "avg" last column spec)
289+
//value: ((rawData[x].length - 1 === parseInt(i)
290+
// && _.controller.CONFIG["_temp_lastColSpec"]
291+
// && _.controller.CONFIG["_temp_lastColSpec"]["levelSummary"] === "avg")
292+
// ? countAverageByColumn
293+
// : countSummaryByColumn)(rawData, xh, rawData.length - 1, i),
294+
value: (countSummaryByColumn)(rawData, xh, rawData.length - 1, i),
275295
style: "font-weight: 900;"
276296
}
277297
}

source/js/DataSource.js

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,13 +155,29 @@ DataSource.prototype.getCurrentData = function (callback) {
155155
}
156156
}
157157

158+
// temporary hard workaround (getting last column specs)
159+
//_.GLOBAL_CONFIG["_temp_lastColSpec"] = (function (lev) {
160+
// var tc = lev,
161+
// f = function (lev) {
162+
// if (lev["childLevels"] && lev["childLevels"].length > 0) {
163+
// for (var i in lev["childLevels"]) {
164+
// f(lev["childLevels"][i]);
165+
// }
166+
// } else {
167+
// tc = lev;
168+
// }
169+
// };
170+
// if (lev) f(lev);
171+
// return tc;
172+
//})(data["columnLevels"][data["columnLevels"].length - 1]);
173+
158174
};
159175

160176
var handleDataReady = function () {
161177

162178
var data = ready.data;
163179

164-
//console.log("Retrieved data:", ready);
180+
console.log("Retrieved data:", ready);
165181

166182
(data.Info || {}).action = _.ACTION;
167183
if (_.ACTION === "MDXDrillthrough") {

source/js/PivotView.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ PivotView.prototype.fixHeaders = function (tableElement) {
271271
}
272272
fhy = fhy.cloneNode(false);
273273
fhy.className = "fixedHeader";
274-
fhy.style.top = temp.offsetTop - 2 + "px";
274+
fhy.style.top = temp.offsetTop + "px";
275275
c1 = getChildrenByTagName(temp, "tr");
276276
for (var i in c1) {
277277
fhy.appendChild(d1 = c1[i].cloneNode(false));

0 commit comments

Comments
 (0)