forked from joachimhs/Montric
-
Notifications
You must be signed in to change notification settings - Fork 1
/
gitdiff.patch
757 lines (726 loc) · 28.8 KB
/
gitdiff.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
diff --git .gitmodules .gitmodules
index 097d5e3..c251e01 100644
--- .gitmodules
+++ .gitmodules
@@ -16,3 +16,6 @@
[submodule "EurekaJ.View/garcon"]
path = EurekaJ.View/garcon
url = https://github.com/erichocean/garcon.git
+[submodule "EurekaJ.View/frameworks/sctable"]
+ path = EurekaJ.View/frameworks/sctable
+ url = https://github.com/jslewis/sctable.git
diff --git EurekaJ.Manager/src/main/java/org/eurekaj/manager/json/BuildJsonObjectsUtil.java EurekaJ.Manager/src/main/java/org/eurekaj/manager/json/BuildJsonObjectsUtil.java
index a22c106..0c72bff 100644
--- EurekaJ.Manager/src/main/java/org/eurekaj/manager/json/BuildJsonObjectsUtil.java
+++ EurekaJ.Manager/src/main/java/org/eurekaj/manager/json/BuildJsonObjectsUtil.java
@@ -8,6 +8,7 @@ import java.text.NumberFormat;
import java.util.*;
import com.sun.org.apache.bcel.internal.generic.GotoInstruction;
+import com.sun.tools.javac.util.Name;
import org.eurekaj.api.datatypes.*;
import org.jsflot.xydata.XYDataList;
import org.jsflot.xydata.XYDataPoint;
@@ -380,4 +381,25 @@ public class BuildJsonObjectsUtil {
return emailObject.toString();
}
+
+ public static String generateArrayOfEndNodesStartingWith(List<TreeMenuNode> treeMenuList, String startingWith) {
+ JSONArray jsonArray = new JSONArray();
+
+ SortedMap<String, String> uniqueEndnodes = new TreeMap<String, String>();
+
+ for (TreeMenuNode treeNode : treeMenuList) {
+ String nodeid = startingWith + ";" + treeNode.getGuiPath().substring(treeNode.getGuiPath().lastIndexOf(":") + 1, treeNode.getGuiPath().length());
+
+ if (treeNode.getGuiPath().startsWith(startingWith)
+ && uniqueEndnodes.get(nodeid) == null) {
+ uniqueEndnodes.put(nodeid, nodeid);
+ }
+ }
+
+ for (String nodename : uniqueEndnodes.values()) {
+ jsonArray.put(nodename);
+
+ }
+ return jsonArray.toString();
+ }
}
diff --git EurekaJ.Manager/src/main/java/org/eurekaj/manager/servlets/ChartServlet.java EurekaJ.Manager/src/main/java/org/eurekaj/manager/servlets/ChartServlet.java
index f0fe526..cf5bd80 100644
--- EurekaJ.Manager/src/main/java/org/eurekaj/manager/servlets/ChartServlet.java
+++ EurekaJ.Manager/src/main/java/org/eurekaj/manager/servlets/ChartServlet.java
@@ -3,6 +3,7 @@ package org.eurekaj.manager.servlets;
import org.eurekaj.api.datatypes.Alert;
import org.eurekaj.api.datatypes.GroupedStatistics;
import org.eurekaj.api.datatypes.LiveStatistics;
+import org.eurekaj.api.datatypes.TreeMenuNode;
import org.eurekaj.api.enumtypes.AlertStatus;
import org.eurekaj.manager.json.BuildJsonObjectsUtil;
import org.eurekaj.manager.json.ParseJsonObjects;
@@ -29,7 +30,7 @@ import java.util.*;
*/
public class ChartServlet extends EurekaJGenericServlet {
- private int getChartTimeSpan(JSONObject jsonRequest) throws JSONException {
+ protected int getChartTimeSpan(JSONObject jsonRequest) throws JSONException {
int chartTimespan = 10;
if (jsonRequest.has("chartTimespan")) {
chartTimespan = jsonRequest.getInt("chartTimespan");
@@ -38,7 +39,7 @@ public class ChartServlet extends EurekaJGenericServlet {
return chartTimespan;
}
- private int getChartResolution(JSONObject jsonRequest) throws JSONException {
+ protected int getChartResolution(JSONObject jsonRequest) throws JSONException {
int chartResolution = 15;
if (jsonRequest.has("chartResolution")) {
chartResolution = jsonRequest.getInt("chartResolution");
@@ -54,7 +55,7 @@ public class ChartServlet extends EurekaJGenericServlet {
return jsonRequest.has("path") && jsonRequest.getString("path").startsWith("_gs_:");
}
- private Long getFromPeriod(int chartTimespan, JSONObject jsonRequest) {
+ protected Long getFromPeriod(int chartTimespan, JSONObject jsonRequest) {
Long chartFromMs = ParseJsonObjects.parseLongFromJson(jsonRequest, "chartFrom");
Long fromPeriod = null;
@@ -70,7 +71,7 @@ public class ChartServlet extends EurekaJGenericServlet {
return fromPeriod;
}
- private Long getToPeriod(JSONObject jsonRequest) {
+ protected Long getToPeriod(JSONObject jsonRequest) {
Long chartToMs = ParseJsonObjects.parseLongFromJson(jsonRequest, "chartTo");
Long toPeriod = null;
@@ -84,7 +85,7 @@ public class ChartServlet extends EurekaJGenericServlet {
return toPeriod;
}
- private Long getChartOffset(JSONObject jsonRequest) throws JSONException {
+ protected Long getChartOffset(JSONObject jsonRequest) throws JSONException {
long chartOffset = 0;
if (jsonRequest.has("chartOffsetMs")) {
chartOffset = jsonRequest.getLong("chartOffsetMs");
@@ -125,7 +126,7 @@ public class ChartServlet extends EurekaJGenericServlet {
alert = getBerkeleyTreeMenuService().getAlert(alertName);
if (alert != null) {
chartPath = alert.getGuiPath();
- seriesLabel = "BerkeleyAlert: " + alert.getAlertName();
+ seriesLabel = "Alert: " + alert.getAlertName();
}
liveList = getBerkeleyTreeMenuService().getLiveStatistics(chartPath, fromPeriod, toPeriod);
@@ -149,13 +150,18 @@ public class ChartServlet extends EurekaJGenericServlet {
} else {
chartPath = pathFromClient;
seriesLabel = chartPath;
-
liveList = getBerkeleyTreeMenuService().getLiveStatistics(chartPath, fromPeriod, toPeriod);
Collections.sort(liveList);
valueCollection = ChartUtil.generateChart(liveList, seriesLabel, fromPeriod * 15000, toPeriod * 15000, chartResolution);
}
- jsonResponse = BuildJsonObjectsUtil.generateChartData(seriesLabel, chartPath, valueCollection, chartoffset);
+ TreeMenuNode treeMenuNode = getBerkeleyTreeMenuService().getTreeMenu(chartPath);
+ if (treeMenuNode != null) {
+ jsonResponse = BuildJsonObjectsUtil.generateChartData(seriesLabel, chartPath, valueCollection, chartoffset);
+ } else {
+ jsonResponse = "{\"instrumentationNode\": \"" + seriesLabel + "\", \"table\": " + BuildJsonObjectsUtil.generateArrayOfEndNodesStartingWith(getBerkeleyTreeMenuService().getTreeMenu(), seriesLabel) + ", \"chart\": null}";
+ }
+
System.out.println("Got Chart Data:\n" + jsonResponse);
}
} catch (JSONException jsonException) {
diff --git EurekaJ.Manager/src/main/java/org/eurekaj/manager/servlets/InstrumentationTableServlet.java EurekaJ.Manager/src/main/java/org/eurekaj/manager/servlets/InstrumentationTableServlet.java
new file mode 100644
index 0000000..521a977
--- /dev/null
+++ EurekaJ.Manager/src/main/java/org/eurekaj/manager/servlets/InstrumentationTableServlet.java
@@ -0,0 +1,101 @@
+package org.eurekaj.manager.servlets;
+
+import org.eurekaj.api.datatypes.LiveStatistics;
+import org.eurekaj.api.datatypes.TreeMenuNode;
+import org.eurekaj.manager.json.BuildJsonObjectsUtil;
+import org.eurekaj.manager.security.*;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: joahaa
+ * Date: 7/9/11
+ * Time: 10:43 AM
+ * To change this template use File | Settings | File Templates.
+ */
+public class InstrumentationTableServlet extends ChartServlet {
+
+ protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ String jsonResponse = "";
+
+ try {
+ JSONObject jsonObject = BuildJsonObjectsUtil.extractRequestJSONContents(request);
+ if (jsonObject.has("getInstrumentationTableData") && org.eurekaj.manager.security.SecurityManager.isAuthenticatedAsUser()) {
+ JSONObject keyObject = jsonObject.getJSONObject("getInstrumentationTableData");
+ String pathFromClient = keyObject.getString("path");
+ Double averageSum = 0.0d;
+ String startsWith = null;
+ String endsWith = null;
+
+ String[] pathParts = pathFromClient.split(";");
+ if (pathParts.length == 2) {
+ startsWith = pathParts[0];
+ endsWith = pathParts[1];
+
+ int chartTimespan = getChartTimeSpan(keyObject);
+
+ Long fromPeriod = getFromPeriod(chartTimespan, keyObject);
+ Long toPeriod = getToPeriod(keyObject);
+
+ int numNodesFound = 0;
+
+ for (TreeMenuNode treeMenuNode : getBerkeleyTreeMenuService().getTreeMenu()) {
+ if (treeMenuNode.getGuiPath().startsWith(startsWith)
+ && treeMenuNode.getGuiPath().endsWith(endsWith)) {
+
+ numNodesFound++;
+ Double averageNodeValue = 0.0d;
+ List<LiveStatistics> liveList = getBerkeleyTreeMenuService().getLiveStatistics(treeMenuNode.getGuiPath(), fromPeriod, toPeriod);
+
+ if (liveList.size() > 0) {
+ Double sumValue = 0.0d;
+ for (LiveStatistics liveStatistics : liveList) {
+ sumValue += liveStatistics.getValue();
+ }
+
+ averageNodeValue = sumValue / liveList.size();
+ }
+
+ averageSum += averageNodeValue;
+ }
+ }
+
+ if (numNodesFound > 0) {
+ averageSum = averageSum / numNodesFound;
+ }
+
+ }
+
+ JSONObject jsonResponseObj = new JSONObject();
+ jsonResponseObj.put("columnId", pathFromClient);
+ jsonResponseObj.put("name", endsWith);
+ jsonResponseObj.put("value", averageSum);
+ jsonResponse = jsonResponseObj.toString();
+ }
+
+ PrintWriter writer = response.getWriter();
+ if (jsonResponse.length() <= 2) {
+ jsonResponse = "{}";
+ }
+ writer.write(jsonResponse);
+ response.flushBuffer();
+
+ } catch (JSONException jsonException) {
+ throw new IOException("Unable to process JSON Request", jsonException);
+ }
+ }
+
+ protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+ }
+
+}
diff --git EurekaJ.Manager/src/main/java/org/eurekaj/manager/servlets/UserServlet.java EurekaJ.Manager/src/main/java/org/eurekaj/manager/servlets/UserServlet.java
index 89d4a10..3da2abc 100644
--- EurekaJ.Manager/src/main/java/org/eurekaj/manager/servlets/UserServlet.java
+++ EurekaJ.Manager/src/main/java/org/eurekaj/manager/servlets/UserServlet.java
@@ -43,7 +43,7 @@ public class UserServlet extends EurekaJGenericServlet {
PrintWriter writer = response.getWriter();
if (jsonResponse.length() <= 2) {
- jsonResponse = "{\"loggedInUser\": []}";
+ jsonResponse = "{\"loggedInUser\": null}";
}
writer.write(jsonResponse);
response.flushBuffer();
diff --git EurekaJ.Manager/src/main/webapp/WEB-INF/web.xml EurekaJ.Manager/src/main/webapp/WEB-INF/web.xml
index 807a0c7..bbd32ca 100644
--- EurekaJ.Manager/src/main/webapp/WEB-INF/web.xml
+++ EurekaJ.Manager/src/main/webapp/WEB-INF/web.xml
@@ -53,6 +53,11 @@
<load-on-startup>1</load-on-startup>
</servlet>
<servlet>
+ <servlet-name>InstrumentationTableServlet</servlet-name>
+ <servlet-class>org.eurekaj.manager.servlets.InstrumentationTableServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet>
<servlet-name>EurekaJGenericServlet</servlet-name>
<servlet-class>org.eurekaj.manager.servlets.EurekaJGenericServlet</servlet-class>
<load-on-startup>1</load-on-startup>
@@ -86,6 +91,10 @@
<servlet-name>UserServlet</servlet-name>
<url-pattern>/user</url-pattern>
</servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>InstrumentationTableServlet</servlet-name>
+ <url-pattern>/table</url-pattern>
+ </servlet-mapping>
<filter>
diff --git EurekaJ.View/Buildfile EurekaJ.View/Buildfile
index 96303b5..78a6058 100644
--- EurekaJ.View/Buildfile
+++ EurekaJ.View/Buildfile
@@ -4,6 +4,6 @@
# ===========================================================================
# Add initial buildfile information here
-config :all, :required => ['sproutcore', 'sproutcore/statechart', 'flot', 'ki', 'scui'], :theme => "sproutcore/ace"
+config :all, :required => ['sproutcore', 'sproutcore/statechart', 'flot', 'sctable', 'scui'], :theme => "sproutcore/ace"
proxy '/', :to => 'localhost:8081'
\ No newline at end of file
diff --git EurekaJ.View/apps/EurekaJView/controllers/chart_grid.js EurekaJ.View/apps/EurekaJView/controllers/chart_grid.js
index 3c7e544..4f758eb 100644
--- EurekaJ.View/apps/EurekaJView/controllers/chart_grid.js
+++ EurekaJ.View/apps/EurekaJView/controllers/chart_grid.js
@@ -25,7 +25,19 @@ EurekaJView.chartGridController = SC.ArrayController.create(
showHistoricalData: NO,
nowShowingTab: null,
orderBy: 'name',
- selectedTimeZoneOffset: null,
+ selectedTimeZoneOffset: null,
+ tableDataColumns: [
+ SC.Object.create(SCTable.Column, {
+ name: "Name",
+ valueKey: 'name',
+ width: 150
+ }),
+ SC.Object.create(SCTable.Column, {
+ name: "Value",
+ valueKey: 'value',
+ width: 150
+ })
+ ],
init: function() {
var fromDate = this.get('selectedChartFrom').advance({minute: -10});
@@ -33,8 +45,8 @@ EurekaJView.chartGridController = SC.ArrayController.create(
this.set('selectedChartFrom', fromDate);
}
this.generateChartStrings();
-
- this.set('selectedTimeZoneOffset', (-1 * new Date().getTimezoneOffset() / 60));
+
+ this.set('selectedTimeZoneOffset', (-1 * new Date().getTimezoneOffset() / 60));
},
nowShowingTabChange: function() {
diff --git EurekaJ.View/apps/EurekaJView/data_sources/eureka_j.js EurekaJ.View/apps/EurekaJView/data_sources/eureka_j.js
index 555e736..5c20645 100644
--- EurekaJ.View/apps/EurekaJView/data_sources/eureka_j.js
+++ EurekaJ.View/apps/EurekaJView/data_sources/eureka_j.js
@@ -35,6 +35,10 @@ EurekaJView.TRIGGERED_ALERTS_QUERY = SC.Query.local(EurekaJView.TriggeredAlertMo
orderby: 'triggeredDate'
});
+EurekaJView.INSTRUMENTATION_TABLE_QUERY = SC.Query.local(EurekaJView.InstrumentationTableModel, {
+ orderby: 'name'
+});
+
EurekaJView.LOGGED_IN_USER_QUERY = SC.Query.local(EurekaJView.UserModel, {});
EurekaJView.EurekaJDataSource = SC.DataSource.extend(
@@ -140,6 +144,19 @@ EurekaJView.EurekaJDataSource = SC.DataSource.extend(
return YES;
}
+ if (query === EurekaJView.INSTRUMENTATION_TABLE_QUERY) {
+ SC.Logger.log('fetching instrumentation Table...');
+ var requestStringJson = {
+ 'getLoggedInUser': true
+ };
+
+ SC.Request.postUrl('/user').header({
+ 'Accept': 'application/json'
+ }).json().notify(this, 'performFetchLoggedInUser', store, query).send(requestStringJson);
+
+ return YES;
+ }
+
return NO; // return YES if you handled the query
},
@@ -204,7 +221,11 @@ EurekaJView.EurekaJDataSource = SC.DataSource.extend(
},
performFetchLoggedInUser: function(response, store, query) {
- if (SC.ok(response)) {
+ SC.Logger.log(response.body);
+ var results = "";
+ if (SC.ok(response) && SC.ok(results = response.get('body'))) {
+ SC.Logger.log('user: ' + response.get('body'));
+ SC.Logger.log('results: ' + results);
EurekaJView.userController.set('username', response.get('body').loggedInUser.username);
EurekaJView.userController.set('userRole', response.get('body').loggedInUser.userRole);
} else {
@@ -275,6 +296,45 @@ EurekaJView.EurekaJDataSource = SC.DataSource.extend(
return YES;
}
+ if (recordType === EurekaJView.InstrumentationTableModel) {
+ SC.Logger.log("Getting Instrumentation Table Model...");
+ var requestStringJson = {};
+
+ if (EurekaJView.chartGridController.get('showHistoricalData') === NO) {
+ requestStringJson = {
+ 'getInstrumentationTableData': {
+ 'id': storeKey,
+ 'path': SC.Store.idFor(storeKey),
+ 'chartTimespan': EurekaJView.chartGridController.selectedChartTimespan,
+ 'chartResolution': EurekaJView.chartGridController.selectedChartResolution,
+ 'chartOffsetMs': EurekaJView.chartGridController.selectedTimeZoneOffset * 60 * 60 * 1000
+ }
+ };
+ } else {
+ var fromMs = EurekaJView.chartGridController.selectedChartFrom.get('milliseconds');
+ var toMs = EurekaJView.chartGridController.selectedChartTo.get('milliseconds');
+ requestStringJson = {
+ 'getInstrumentationTableData': {
+ 'id': storeKey,
+ 'path': SC.Store.idFor(storeKey),
+ 'chartFrom': fromMs,
+ 'chartTo': toMs,
+ 'chartResolution': EurekaJView.chartGridController.selectedChartResolution,
+ 'chartOffsetMs': EurekaJView.chartGridController.selectedTimeZoneOffset * 60 * 60 * 1000
+ }
+ };
+ }
+
+ SC.Request.postUrl('/table').header({
+ 'Accept': 'application/json'
+ }).json().notify(this, this.performRetrieveTableRecord, {
+ store: store,
+ storeKey: storeKey
+ }).send(requestStringJson);
+
+ return YES;
+ }
+
return NO; // return YES if you handled the storeKey
},
@@ -292,6 +352,20 @@ EurekaJView.EurekaJDataSource = SC.DataSource.extend(
} else store.dataSourceDidError(storeKey, response.get('body'));
},
+ performRetrieveTableRecord: function(response, params) {
+ var store = params.store;
+ var storeKey = params.storeKey;
+
+ // normal: load into store...response == dataHash
+ if (SC.$ok(response)) {
+ SC.Logger.log('Finished loading Instrumentation Table');
+ //SC.Logger.log(response.get('body').data);
+ EurekaJView.chartGridController.triggerTimer();
+ store.dataSourceDidComplete(storeKey, response.get('body'));
+ // error: indicate as such...response == error
+ } else store.dataSourceDidError(storeKey, response.get('body'));
+ },
+
performRetrieveEmailRecipientRecord: function(response, params) {
var store = params.store;
var storeKey = params.storeKey;
diff --git EurekaJ.View/apps/EurekaJView/models/chart_grid_model.js EurekaJ.View/apps/EurekaJView/models/chart_grid_model.js
index 051e6e1..ba2003b 100644
--- EurekaJ.View/apps/EurekaJView/models/chart_grid_model.js
+++ EurekaJ.View/apps/EurekaJView/models/chart_grid_model.js
@@ -13,10 +13,27 @@
*/
EurekaJView.ChartGridModel = SC.Record.extend(
/** @scope EurekaJView.ChartGridModel.prototype */ {
- primaryKey: 'chart',
+ primaryKey: 'instrumentationNode',
chart: SC.Record.attr(Array),
- chartLabel: SC.Record.attr(String)
- //label: SC.Record.attr(String),
- //data: SC.Record.attr(Array)
+ instrumentationNode: SC.Record.attr(String),
+ table: SC.Record.toMany('EurekaJView.InstrumentationTableModel'),
-}) ;
+ isChart: function() {
+ SC.Logger.log("isChart: " + this.get('chart'))
+ if ((this.get('chart'))) {
+ return true;
+ }
+
+ return false;
+ }.property(),
+
+ isTable: function() {
+ SC.Logger.log("isTable: " + this.get('table'))
+ var isTableBoolean = false;
+ this.get('table').forEach(function(o) {
+ isTableBoolean = true;
+ }, this);
+
+ return isTableBoolean;
+ }.property()
+});
diff --git EurekaJ.View/apps/EurekaJView/models/instrumentation_table_model.js EurekaJ.View/apps/EurekaJView/models/instrumentation_table_model.js
new file mode 100644
index 0000000..1578427
--- /dev/null
+++ EurekaJ.View/apps/EurekaJView/models/instrumentation_table_model.js
@@ -0,0 +1,26 @@
+// ==========================================================================
+// Project: EurekaJView.InstrumentationTableModel
+// Copyright: ©2010 My Company, Inc.
+// ==========================================================================
+/*globals EurekaJView */
+
+/** @class
+
+ (Document your Model here)
+
+ @extends SC.Record
+ @version 0.1
+*/
+EurekaJView.InstrumentationTableModel = SC.Record.extend(
+/** @scope EurekaJView.InstrumentationTableModel.prototype */
+{
+
+ primaryKey: 'columnId',
+ columnId: SC.Record.attr(String),
+ name: SC.Record.attr(String),
+ value: SC.Record.attr(Number),
+
+ listValue: function() {
+ return this.get('name') + ' avg: ' + this.get('value');
+ }.property()
+});
diff --git EurekaJ.View/apps/EurekaJView/models/instrumentation_tree_model.js EurekaJ.View/apps/EurekaJView/models/instrumentation_tree_model.js
index 6be69ee..68e394f 100644
--- EurekaJ.View/apps/EurekaJView/models/instrumentation_tree_model.js
+++ EurekaJ.View/apps/EurekaJView/models/instrumentation_tree_model.js
@@ -48,7 +48,7 @@ EurekaJView.InstrumentationTreeModel = SC.Record.extend(
}.property(),
checkboxKey: function() {
- if (!this.get('hasChildren')) {
+ if (this.get('parentPath')) {
return 'isSelected';
} else {
return null;
diff --git EurekaJ.View/apps/EurekaJView/resources/images/mini_222222.png EurekaJ.View/apps/EurekaJView/resources/images/mini_222222.png
new file mode 100755
index 0000000..67560da
Binary files /dev/null and EurekaJ.View/apps/EurekaJView/resources/images/mini_222222.png differ
diff --git EurekaJ.View/apps/EurekaJView/resources/images/mini_888888.png EurekaJ.View/apps/EurekaJView/resources/images/mini_888888.png
new file mode 100755
index 0000000..5c56455
Binary files /dev/null and EurekaJ.View/apps/EurekaJView/resources/images/mini_888888.png differ
diff --git EurekaJ.View/apps/EurekaJView/resources/table.css EurekaJ.View/apps/EurekaJView/resources/table.css
new file mode 100755
index 0000000..6867cfa
--- /dev/null
+++ EurekaJ.View/apps/EurekaJView/resources/table.css
@@ -0,0 +1,123 @@
+/* ==========================================================================
+ * Project: SCTable - JavaScript Framework
+ * Copyright: ©2011 Jonathan Lewis and contributors.
+ * License: Licensed under MIT license (see license.js)
+ * ==========================================================================
+ */
+
+/* Table */
+
+.sctable-table-view {
+ background-color: #e7e7e7;
+ white-space: nowrap;
+}
+
+
+/* Table Header */
+
+.sctable-header-scroll-view {
+ background-color: #e7e7e7;
+}
+
+.sctable-header-view div {
+ position: absolute;
+ overflow: hidden;
+}
+
+
+/* Column Headers */
+
+.sctable-column-header-view {
+ background-color: #e7e7e7;
+}
+
+.sctable-column-header-view .col-border {
+ top: 0px;
+ left: 0px;
+ bottom: 0px;
+ right: 0px;
+ border-left: 1px solid #f7f7f7;
+ border-right: 1px solid #d6d6d6;
+}
+
+.sctable-column-header-view .col-name {
+ top: 0px;
+ left: 0px;
+ bottom: 0px;
+ right: 0px;
+ margin-top: 5px;
+ margin-left: 3px;
+}
+
+.sctable-column-header-view .resize-handle {
+ top: 5px;
+ right: 0px;
+ width: 16px;
+ height: 16px;
+ cursor: col-resize;
+ background-image: static_url('images/mini_888888.png');
+ background-position: -32px -224px;
+}
+
+.sctable-column-header-view .sort-indicator {
+ top: 6px;
+ right: 10px;
+ width: 16px;
+ height: 16px;
+}
+
+.sctable-column-header-view .sort-indicator.asc {
+ background-image: static_url('images/mini_888888.png');
+ background-position: 0px -16px;
+}
+
+.sctable-column-header-view .sort-indicator.desc {
+ background-image: static_url('images/mini_888888.png');
+ background-position: -64px -16px;
+}
+
+.sctable-column-header-view.hover {
+ background-color: #efefef;
+}
+
+.sctable-column-header-view.sel {
+ background-color: #ffffff !important;
+}
+
+
+/* Table Rows */
+
+.sctable-row-view div {
+ position: absolute;
+ overflow: hidden;
+}
+
+.sctable-row-view {
+ border-left: 0px;
+ border-right: 0px;
+ border-top: 0px;
+ border-bottom: 1px solid #d6d6d6;
+}
+
+.sctable-row-view .cell {
+ border-right: 1px solid #f2f2f2;
+}
+
+.sctable-row-view .cell .text {
+ top: 2px;
+ left: 3px;
+}
+
+.sctable-row-view.sel {
+ background-color: #CDDBF6 !important;
+ border-right: 0px none;
+ color: black !important;
+}
+
+.sctable-row-view.sel .cell {
+ border-right: 0px none;
+}
+
+.sctable-row-view.hover {
+ background-color: #e7e7e7;
+}
\ No newline at end of file
diff --git EurekaJ.View/apps/EurekaJView/views/chart/chart_view.js EurekaJ.View/apps/EurekaJView/views/chart/chart_view.js
index 7fc5cb1..e4df36e 100644
--- EurekaJ.View/apps/EurekaJView/views/chart/chart_view.js
+++ EurekaJ.View/apps/EurekaJView/views/chart/chart_view.js
@@ -14,7 +14,7 @@ EurekaJView.ChartView = SC.View.extend(
/** @scope EurekaJView.ChartViewTwo.prototype */
{
contentDisplayProperties: 'content'.w(),
- childViews: 'chartLabel chart'.w(),
+ childViews: 'chartLabel chart table'.w(),
chartLabel: SC.LabelView.design({
layout: {
@@ -31,11 +31,49 @@ EurekaJView.ChartView = SC.View.extend(
}),
chart: Flot.GraphView.design({
+ isVisibleBinding: '.parentView.content.isChart',
layout: { top: 30, right: 5, bottom: 5, left: 5 },
seriesBinding: '.parentView.content',
//data: [SC.Object.create({label: 'set1', data:[[1,1], [2,2]]})],
debugInConsole: NO,
showTooltip: YES
- })
+ }),
+
+ /*table: SC.TableView.design({
+ isVisible: '.parentView.content.isTable',
+ layout: { top: 30, right: 5, bottom: 5, left: 5 },
+
+ columns: [
+ SC.TableColumn.design({
+ key: 'name',
+ title: 'value',
+ width: 200
+ })
+ ],
+
+ contentBinding: '.parentView.content.table'
+
+ })*/
+
+ /*table: SC.ListView.design({
+ isVisibleBinding: '.parentView.content.isTable',
+ layout: { top: 30, right: 5, bottom: 5, left: 5 },
+ backgroundColor: '#F0F8FF',
+ contentValueKey: "listValue",
+ rowHeight: 18,
+ borderStyle: SC.BORDER_NONE,
+ isSelectable: YES,
+
+ contentBinding: '.parentView.content.table'
+ }), */
+
+ table: SCTable.TableView.design({
+ isVisibleBinding: '.parentView.content.isTable',
+ layout: { top: 30, right: 5, bottom: 5, left: 5 },
+
+ contentBinding: '.parentView.content.table',
+
+ columnsBinding: 'EurekaJView.chartGridController.tableDataColumns'
+ })
});
diff --git EurekaJ.View/frameworks/flot/views/graph.js EurekaJ.View/frameworks/flot/views/graph.js
index 9bcae10..6f580e3 100644
--- EurekaJ.View/frameworks/flot/views/graph.js
+++ EurekaJ.View/frameworks/flot/views/graph.js
@@ -80,9 +80,11 @@ Flot.GraphView = SC.View.extend(
if (this.debugInConsole) console.log('render data');
} else if (!SC.empty(seriesObject) && (seriesObject.get('status') & SC.Record.READY)) {
SC.Logger.log('seriesObject.chart: ' + seriesObject.get('chart'));
- var seriesArray = seriesObject.get('chart');
- Flot.plot(this.get('layer'), seriesArray, options);
- if (this.debugInConsole) console.log('render series');
+ if (seriesObject.get('chart')) {
+ var seriesArray = seriesObject.get('chart');
+ Flot.plot(this.get('layer'), seriesArray, options);
+ if (this.debugInConsole) console.log('render series');
+ }
} else {
if (this.debugInConsole) console.warn('data was empty');
}
diff --git EurekaJ.View/frameworks/sctable EurekaJ.View/frameworks/sctable
new file mode 160000
index 0000000..77ddd6a
--- /dev/null
+++ EurekaJ.View/frameworks/sctable
@@ -0,0 +1 @@
+Subproject commit 77ddd6a5a59f981bf631ed5d3049d3a921b21078