cpee 1.3.177 → 1.3.178
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/cockpit/css/ui.css +20 -3
- data/cockpit/{lib → css}/wfadaptor.css +0 -0
- data/cockpit/index.html +47 -22
- data/cockpit/js/details.js +18 -18
- data/cockpit/js/instance.js +50 -9
- data/cockpit/js/parameters.js +16 -15
- data/cockpit/js/ui.js +1 -4
- data/cockpit/js/wfadaptor.cpee.js +3 -20
- data/cockpit/{lib → js}/wfadaptor.js +39 -15
- data/cockpit/rngtest.html +14 -35
- data/cockpit/rngtest.rng +17 -39
- data/cockpit/rngtest.xml +7 -6
- data/cockpit/test.html +46 -0
- data/cockpit/testsets/Infinity.xml +28 -0
- data/cockpit/testsets/testsets.xml +1 -0
- data/cpee.gemspec +1 -1
- data/lib/cpee/controller.rb +8 -8
- data/lib/cpee/handler_properties.rb +1 -0
- data/lib/cpee/implementation.rb +9 -0
- data/lib/engine.xml +3 -3
- data/server/resources/topics.xml +3 -0
- data/test/{cb.rb → callback.rb} +0 -0
- metadata +8 -103
- data/cockpit/lib/custommenu.css +0 -84
- data/cockpit/lib/custommenu.js +0 -101
- data/cockpit/lib/jquery.browser.js +0 -40
- data/cockpit/lib/jquery.caret.min.js +0 -10
- data/cockpit/lib/jquery.cookie.js +0 -117
- data/cockpit/lib/jquery.min.js +0 -4
- data/cockpit/lib/jquery.svg.min.js +0 -6
- data/cockpit/lib/jquery.svgdom.min.js +0 -6
- data/cockpit/lib/parsequery.js +0 -19
- data/cockpit/lib/printf.js +0 -368
- data/cockpit/lib/relaxngui.js +0 -4
- data/cockpit/lib/strftime.min.js +0 -1
- data/cockpit/lib/ui.css +0 -261
- data/cockpit/lib/ui.js +0 -114
- data/cockpit/lib/underscore.min.js +0 -27
- data/cockpit/lib/util.js +0 -58
- data/cockpit/lib/wfadaptor-doc/demo1.html +0 -517
- data/cockpit/lib/wfadaptor-doc/demo2.html +0 -84
- data/cockpit/lib/wfadaptor-doc/index.html +0 -54
- data/server/instances/1/properties.xml +0 -113
- data/server/instances/10/properties.xml +0 -145
- data/server/instances/11/properties.xml +0 -169
- data/server/instances/12/properties.xml +0 -44
- data/server/instances/13/properties.xml +0 -146
- data/server/instances/14/notifications/5bcce90b170116a77fb25aea4e133acc/consumer-secret +0 -1
- data/server/instances/14/notifications/5bcce90b170116a77fb25aea4e133acc/producer-secret +0 -1
- data/server/instances/14/notifications/5bcce90b170116a77fb25aea4e133acc/subscription.xml +0 -23
- data/server/instances/14/properties.xml +0 -332
- data/server/instances/15/properties.xml +0 -44
- data/server/instances/16/properties.xml +0 -44
- data/server/instances/17/properties.xml +0 -44
- data/server/instances/18/properties.xml +0 -45
- data/server/instances/19/properties.xml +0 -45
- data/server/instances/2/properties.xml +0 -230
- data/server/instances/20/properties.xml +0 -46
- data/server/instances/21/properties.xml +0 -46
- data/server/instances/22/notifications/f9c504b8c715ec94a99fc3c6a660c53a/consumer-secret +0 -1
- data/server/instances/22/notifications/f9c504b8c715ec94a99fc3c6a660c53a/producer-secret +0 -1
- data/server/instances/22/notifications/f9c504b8c715ec94a99fc3c6a660c53a/subscription.xml +0 -23
- data/server/instances/22/properties.xml +0 -112
- data/server/instances/23/notifications/0a5a059f4ae897aee1446d560210dec0/consumer-secret +0 -1
- data/server/instances/23/notifications/0a5a059f4ae897aee1446d560210dec0/producer-secret +0 -1
- data/server/instances/23/notifications/0a5a059f4ae897aee1446d560210dec0/subscription.xml +0 -23
- data/server/instances/23/properties.xml +0 -148
- data/server/instances/24/properties.xml +0 -66
- data/server/instances/25/properties.xml +0 -46
- data/server/instances/26/properties.xml +0 -112
- data/server/instances/27/properties.xml +0 -212
- data/server/instances/28/properties.xml +0 -363
- data/server/instances/29/properties.xml +0 -148
- data/server/instances/3/properties.xml +0 -109
- data/server/instances/30/properties.xml +0 -150
- data/server/instances/31/properties.xml +0 -52
- data/server/instances/32/properties.xml +0 -52
- data/server/instances/33/properties.xml +0 -60
- data/server/instances/34/properties.xml +0 -148
- data/server/instances/35/properties.xml +0 -148
- data/server/instances/36/properties.xml +0 -150
- data/server/instances/37/notifications/5f979ed943f91ff75d75e551ba0642d6/consumer-secret +0 -1
- data/server/instances/37/notifications/5f979ed943f91ff75d75e551ba0642d6/producer-secret +0 -1
- data/server/instances/37/notifications/5f979ed943f91ff75d75e551ba0642d6/subscription.xml +0 -33
- data/server/instances/37/properties.xml +0 -57
- data/server/instances/38/properties.xml +0 -46
- data/server/instances/39/properties.xml +0 -58
- data/server/instances/4/properties.xml +0 -43
- data/server/instances/40/properties.xml +0 -148
- data/server/instances/41/properties.xml +0 -46
- data/server/instances/42/properties.xml +0 -148
- data/server/instances/43/notifications/9e7d05164a8539415d008b5bca3e0672/consumer-secret +0 -1
- data/server/instances/43/notifications/9e7d05164a8539415d008b5bca3e0672/producer-secret +0 -1
- data/server/instances/43/notifications/9e7d05164a8539415d008b5bca3e0672/subscription.xml +0 -34
- data/server/instances/43/properties.xml +0 -148
- data/server/instances/44/properties.xml +0 -148
- data/server/instances/45/notifications/442ed76f5da42dc9c57713840d713510/consumer-secret +0 -1
- data/server/instances/45/notifications/442ed76f5da42dc9c57713840d713510/producer-secret +0 -1
- data/server/instances/45/notifications/442ed76f5da42dc9c57713840d713510/subscription.xml +0 -34
- data/server/instances/45/properties.xml +0 -148
- data/server/instances/46/properties.xml +0 -46
- data/server/instances/47/notifications/63fba892899cc92fca381a666089e8d9/consumer-secret +0 -1
- data/server/instances/47/notifications/63fba892899cc92fca381a666089e8d9/producer-secret +0 -1
- data/server/instances/47/notifications/63fba892899cc92fca381a666089e8d9/subscription.xml +0 -34
- data/server/instances/47/notifications/e0cdacd3147aa31b0478a3ab1155db6c/consumer-secret +0 -1
- data/server/instances/47/notifications/e0cdacd3147aa31b0478a3ab1155db6c/producer-secret +0 -1
- data/server/instances/47/notifications/e0cdacd3147aa31b0478a3ab1155db6c/subscription.xml +0 -34
- data/server/instances/47/properties.xml +0 -148
- data/server/instances/5/properties.xml +0 -23
- data/server/instances/6/properties.xml +0 -203
- data/server/instances/7/properties.xml +0 -149
- data/server/instances/8/properties.xml +0 -145
- data/server/instances/9/properties.xml +0 -145
- data/server/server.pid +0 -1
- data/test/delete.rb +0 -27
- data/test/load.rb +0 -55
- data/test/testset.xml +0 -297
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: c9056bb390337add6a04bc9728904dcfa69f600c
|
4
|
+
data.tar.gz: 104f455eb96d01c0642f0a782c1514b4ce250e3e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: c3f8788cb1e42f4ff7dd776b5ce52960fee4f9b4a01d3031ba9b6b062e9aea50d4bb1c13a2160bcc4c7c519f4a3962659659aa6ecc79da04079f9e28b43eff9e
|
7
|
+
data.tar.gz: a3c413f963c3c5206f4590de1d96e7ede055c524de42d439565e09b31433060642e1917fa980f3ac3843206d9e6be4e4ba99508fcb9fcd40e41fb0d88b86e830
|
data/cockpit/css/ui.css
CHANGED
@@ -26,12 +26,11 @@ ui-tabbed ui-tabbar ui-behind button {
|
|
26
26
|
content: "|";
|
27
27
|
}
|
28
28
|
|
29
|
-
button.highlight { background-color: #cc0000; }
|
30
|
-
|
31
29
|
#parameters ui-content { height: 9em; min-height: 1.7em; }
|
32
30
|
|
33
31
|
#areadataelements { height: 100%; overflow-x: hidden; overflow-y: scroll; }
|
34
|
-
#areaendpoints
|
32
|
+
#areaendpoints { height: 100%; overflow-x: hidden; overflow-y: scroll; }
|
33
|
+
#areaattributes { height: 100%; overflow-x: hidden; overflow-y: scroll; }
|
35
34
|
|
36
35
|
#areainstance input[type=file] { display: none; }
|
37
36
|
#areainstance div.section { display: table-cell; vertical-align: middle; }
|
@@ -97,6 +96,24 @@ button.highlight { background-color: #cc0000; }
|
|
97
96
|
#dat_dataelements input:first-child { border: 0 none; width: 8em; }
|
98
97
|
#dat_dataelements input:last-child { border: 0 none; width: 100%; }
|
99
98
|
|
99
|
+
#dat_attributes {
|
100
|
+
border-collapse:collapse;
|
101
|
+
border-spacing:0;
|
102
|
+
border:0 none;
|
103
|
+
margin:0;
|
104
|
+
padding:0;
|
105
|
+
width: 100%;
|
106
|
+
}
|
107
|
+
#dat_attributes button { border: 1pt solid buttonshadow; padding: 0; }
|
108
|
+
#dat_attributes td:nth-child(1) { width: 1.2em; font-size: 1.3em; font-weight: bold;}
|
109
|
+
#dat_attributes td:nth-child(2) { width: 8em; }
|
110
|
+
#dat_attributes td:nth-child(3) { width: 1em; }
|
111
|
+
#dat_attributes tr:nth-child(odd) { background-color: ButtonFace; color: ButtonText; }
|
112
|
+
#dat_attributes tr:nth-child(odd) input { background-color: ButtonFace; }
|
113
|
+
#dat_attributes input { border: 0 none; padding: 0; margin: 0; }
|
114
|
+
#dat_attributes input:first-child { border: 0 none; width: 8em; }
|
115
|
+
#dat_attributes input:last-child { border: 0 none; width: 100%; }
|
116
|
+
|
100
117
|
#areadsl div { padding: 0 1em; }
|
101
118
|
#areadsl div:first-child { padding-top: 1em; }
|
102
119
|
#areadsl div:last-child { padding-bottom: 1em; }
|
File without changes
|
data/cockpit/index.html
CHANGED
@@ -20,36 +20,57 @@
|
|
20
20
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
21
21
|
<title>CPEE Cockpit</title>
|
22
22
|
|
23
|
-
<!-- libs, do not modify -->
|
24
|
-
<script
|
25
|
-
|
23
|
+
<!-- libs, do not modify. When local than load local libs. -->
|
24
|
+
<script type="text/javascript">
|
25
|
+
if (document.location.hostname == 'localhost') {
|
26
|
+
document.write('<script type="text/javascript" src="http://localhost/js_libs/jquery.min.js">\x3C/script>');
|
27
|
+
document.write('<script type="text/javascript" src="http://localhost/js_libs/jquery.browser.js">\x3C/script>');
|
28
|
+
document.write('<script type="text/javascript" src="http://localhost/js_libs/jquery.svg.min.js">\x3C/script>');
|
29
|
+
document.write('<script type="text/javascript" src="http://localhost/js_libs/jquery.svgdom.min.js">\x3C/script>');
|
30
|
+
document.write('<script type="text/javascript" src="http://localhost/js_libs/util.js">\x3C/script>');
|
31
|
+
document.write('<script type="text/javascript" src="http://localhost/js_libs/printf.js">\x3C/script>');
|
32
|
+
document.write('<script type="text/javascript" src="http://localhost/js_libs/strftime.min.js">\x3C/script>');
|
33
|
+
document.write('<script type="text/javascript" src="http://localhost/js_libs/parsequery.js">\x3C/script>');
|
34
|
+
document.write('<script type="text/javascript" src="http://localhost/js_libs/underscore.min.js">\x3C/script>');
|
35
|
+
document.write('<script type="text/javascript" src="http://localhost/js_libs/jquery.caret.min.js">\x3C/script>');
|
36
|
+
document.write('<script type="text/javascript" src="http://localhost/js_libs/jquery.cookie.js">\x3C/script>');
|
26
37
|
|
27
|
-
|
28
|
-
|
29
|
-
<script type="text/javascript" src="lib/jquery.svgdom.min.js"></script>
|
30
|
-
<script type="text/javascript" src="lib/util.js"></script>
|
31
|
-
<script type="text/javascript" src="lib/printf.js"></script>
|
32
|
-
<script type="text/javascript" src="lib/strftime.min.js"></script>
|
33
|
-
<script type="text/javascript" src="lib/parsequery.js"></script>
|
34
|
-
<script type="text/javascript" src="lib/underscore.min.js"></script>
|
35
|
-
<script type="text/javascript" src="lib/jquery.caret.min.js"></script>
|
36
|
-
<script type="text/javascript" src="lib/jquery.cookie.js"></script>
|
38
|
+
document.write('<script type="text/javascript" src="http://localhost/js_libs/ui.js">\x3C/script>');
|
39
|
+
document.write('<script type="text/javascript" src="http://localhost/js_libs/custommenu.js">\x3C/script>');
|
37
40
|
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
+
document.write('<link rel="stylesheet" href="http://localhost/js_libs/custommenu.css" type="text/css"/>');
|
42
|
+
document.write('<link rel="stylesheet" href="http://localhost/js_libs/ui.css" type="text/css"/>');
|
43
|
+
} else {
|
44
|
+
document.write('<script type="text/javascript" src="http://gruppe.wst.univie.ac.at/js_libs/jquery.min.js">\x3C/script>');
|
45
|
+
document.write('<script type="text/javascript" src="http://gruppe.wst.univie.ac.at/js_libs/jquery.browser.js">\x3C/script>');
|
46
|
+
document.write('<script type="text/javascript" src="http://gruppe.wst.univie.ac.at/js_libs/jquery.svg.min.js">\x3C/script>');
|
47
|
+
document.write('<script type="text/javascript" src="http://gruppe.wst.univie.ac.at/js_libs/jquery.svgdom.min.js">\x3C/script>');
|
48
|
+
document.write('<script type="text/javascript" src="http://gruppe.wst.univie.ac.at/js_libs/util.js">\x3C/script>');
|
49
|
+
document.write('<script type="text/javascript" src="http://gruppe.wst.univie.ac.at/js_libs/printf.js">\x3C/script>');
|
50
|
+
document.write('<script type="text/javascript" src="http://gruppe.wst.univie.ac.at/js_libs/strftime.min.js">\x3C/script>');
|
51
|
+
document.write('<script type="text/javascript" src="http://gruppe.wst.univie.ac.at/js_libs/parsequery.js">\x3C/script>');
|
52
|
+
document.write('<script type="text/javascript" src="http://gruppe.wst.univie.ac.at/js_libs/underscore.min.js">\x3C/script>');
|
53
|
+
document.write('<script type="text/javascript" src="http://gruppe.wst.univie.ac.at/js_libs/jquery.caret.min.js">\x3C/script>');
|
54
|
+
document.write('<script type="text/javascript" src="http://gruppe.wst.univie.ac.at/js_libs/jquery.cookie.js">\x3C/script>');
|
41
55
|
|
42
|
-
|
43
|
-
|
44
|
-
<link rel="stylesheet" href="lib/ui.css" type="text/css"/>
|
56
|
+
document.write('<script type="text/javascript" src="http://gruppe.wst.univie.ac.at/js_libs/ui.js">\x3C/script>');
|
57
|
+
document.write('<script type="text/javascript" src="http://gruppe.wst.univie.ac.at/js_libs/custommenu.js">\x3C/script>');
|
45
58
|
|
46
|
-
|
59
|
+
document.write('<link rel="stylesheet" href="http://gruppe.wst.univie.ac.at/js_libs/custommenu.css" type="text/css"/>');
|
60
|
+
document.write('<link rel="stylesheet" href="http://gruppe.wst.univie.ac.at/js_libs/ui.css" type="text/css"/>');
|
61
|
+
}
|
62
|
+
</script>
|
63
|
+
|
64
|
+
<!-- modelling ui -->
|
65
|
+
<script type="text/javascript" src="js/wfadaptor.js"></script>
|
66
|
+
<script type="text/javascript" src="js/wfadaptor.cpee.js"></script>
|
67
|
+
<link rel="stylesheet" href="css/wfadaptor.css" type="text/css"/>
|
47
68
|
|
69
|
+
<!-- custom stuff, play arround -->
|
48
70
|
<script type="text/javascript" src="js/ui.js"></script>
|
49
71
|
<script type="text/javascript" src="js/instance.js"></script>
|
50
72
|
<script type="text/javascript" src="js/details.js"></script>
|
51
73
|
<script type="text/javascript" src="js/parameters.js"></script>
|
52
|
-
<script type="text/javascript" src="js/wfadaptor.cpee.js"></script>
|
53
74
|
<link rel="stylesheet" href="css/ui.css" type="text/css"/>
|
54
75
|
</head>
|
55
76
|
<body data-defaultport="9298" is="x-ui">
|
@@ -239,7 +260,8 @@
|
|
239
260
|
<ui-tab class="switch" ></ui-tab>
|
240
261
|
<ui-tab class="" data-tab="dataelements" id="tabdataelements">Data Elements</ui-tab>
|
241
262
|
<ui-tab class="inactive" data-tab="endpoints" id="tabendpoints" >Endpoints</ui-tab>
|
242
|
-
<ui-
|
263
|
+
<ui-tab class="inactive" data-tab="attributes" id="tabattributes" >Attributes</ui-tab>
|
264
|
+
<ui-behind ><button title='Ctrl-N while editing entry'>New</button><button title='Ctrl-S while editing entry'>Save</button></ui-behind>
|
243
265
|
</ui-tabbar>
|
244
266
|
<ui-content>
|
245
267
|
<ui-area data-belongs-to-tab="dataelements" id="areadataelements"> <!--{{{-->
|
@@ -248,6 +270,9 @@
|
|
248
270
|
<ui-area data-belongs-to-tab="endpoints" id="areaendpoints" class="inactive"> <!--{{{-->
|
249
271
|
<table id="dat_endpoints"></table>
|
250
272
|
</ui-area> <!--}}}-->
|
273
|
+
<ui-area data-belongs-to-tab="attributes" id="areaattributes" class="inactive"> <!--{{{-->
|
274
|
+
<table id="dat_attributes"></table>
|
275
|
+
</ui-area> <!--}}}-->
|
251
276
|
</ui-content>
|
252
277
|
</ui-tabbed>
|
253
278
|
|
data/cockpit/js/details.js
CHANGED
@@ -1,66 +1,66 @@
|
|
1
1
|
$(document).ready(function() {
|
2
|
-
$('#main
|
2
|
+
$('#main ui-behind button').hide();
|
3
3
|
|
4
4
|
// save buttons shown or not //{{{
|
5
|
-
$('#main
|
6
|
-
var me = $(event.target).parents('
|
5
|
+
$('#main ui-tabbar ui-tab:not(.switch)').click(function(event){
|
6
|
+
var me = $(event.target).parents('ui-tab');
|
7
7
|
if ($('#state').text() != 'finished')
|
8
8
|
if (me.attr('id') == 'tabdetails') {
|
9
|
-
$('#main
|
9
|
+
$('#main ui-behind button').show();
|
10
10
|
} else {
|
11
|
-
$('#main
|
11
|
+
$('#main ui-behind button').hide();
|
12
12
|
}
|
13
13
|
}); //}}}
|
14
14
|
|
15
15
|
// New entry //{{{
|
16
16
|
$(document).on('click','#main .header button',function(){
|
17
|
-
var node = new_entry($(this).parents('
|
17
|
+
var node = new_entry($(this).parents('ui-tabbed'));
|
18
18
|
node.addClass('indent');
|
19
19
|
}); //}}}
|
20
20
|
|
21
21
|
// Delete entries //{{{
|
22
22
|
$(document).on('click','#main td.del a',function(event){
|
23
|
-
var top = $(event.target).parents('
|
23
|
+
var top = $(event.target).parents('ui-tabbed');
|
24
24
|
remove_entry($("input",$(event.target).parents('tr')).get(0),false);
|
25
25
|
mark_main_save(top);
|
26
26
|
return false;
|
27
27
|
}); //}}}
|
28
28
|
|
29
29
|
// Save entries //{{{
|
30
|
-
$('#main
|
31
|
-
save_main($(event.target).parents('
|
30
|
+
$('#main ui-behind button').click(function(event){
|
31
|
+
save_main($(event.target).parents('ui-tabbed'));
|
32
32
|
}); //}}}
|
33
33
|
|
34
|
-
$(document).on('keyup','#dat_details input.pair_name, #dat_details input.prop_value, #dat_details textarea.prop_value, #dat_details select.prop_value, #dat_details input.pair_value',function(e){ mark_main_save($(e.target).parents('
|
35
|
-
$(document).on('change','#dat_details select.prop_value',function(e){ mark_main_save($(e.target).parents('
|
34
|
+
$(document).on('keyup','#dat_details input.pair_name, #dat_details input.prop_value, #dat_details textarea.prop_value, #dat_details select.prop_value, #dat_details input.pair_value',function(e){ mark_main_save($(e.target).parents('ui-tabbed')); });
|
35
|
+
$(document).on('change','#dat_details select.prop_value',function(e){ mark_main_save($(e.target).parents('ui-tabbed')); });
|
36
36
|
});
|
37
37
|
|
38
38
|
function mark_main_save(top) { //{{{
|
39
|
-
var visid = $('
|
39
|
+
var visid = $('ui-tabbar ui-tab',top).not('.switch').not('.inactive').attr('id').replace(/tab/,'');
|
40
40
|
var tab = $('#dat_' + visid);
|
41
41
|
var details = serialize_details(tab).serializeXML();
|
42
42
|
|
43
43
|
if (details != save[visid]) {
|
44
|
-
$('
|
44
|
+
$('ui-tabbar ui-behind button',top).addClass('highlight');
|
45
45
|
} else {
|
46
|
-
$('
|
46
|
+
$('ui-tabbar ui-behind button',top).removeClass('highlight');
|
47
47
|
}
|
48
48
|
} //}}}
|
49
49
|
function save_main(top) { //{{{
|
50
|
-
var visid = $('
|
50
|
+
var visid = $('ui-tabbar ui-tab',top).not('.switch').not('.inactive').attr('id').replace(/tab/,'');
|
51
51
|
var tab = $('#dat_' + visid);
|
52
52
|
var node = graphrealization.description.get_node_by_svg_id($('input.pname_svgid').val());
|
53
53
|
var details = serialize_details(tab).serializeXML();
|
54
54
|
if (details != save[visid]) {
|
55
55
|
save[visid] = details;
|
56
|
-
$('
|
56
|
+
$('ui-tabbar ui-behind button',top).removeClass('highlight');
|
57
57
|
|
58
58
|
var newn = serialize_details(tab).attr('svg-id',$('input.pname_svgid').val());
|
59
59
|
if (newn.children().length == 0) {
|
60
60
|
newn.append(node.children());
|
61
61
|
}
|
62
62
|
node.replaceWith(newn);
|
63
|
-
$('
|
63
|
+
$('ui-tabbar ui-behind button:nth-child(2)',top).removeClass('highlight');
|
64
64
|
|
65
65
|
save_description();
|
66
66
|
}
|
@@ -68,7 +68,7 @@ function save_main(top) { //{{{
|
|
68
68
|
|
69
69
|
function save_description() {
|
70
70
|
var serxml = graphrealization.description.get_description();
|
71
|
-
var url = $("
|
71
|
+
var url = $("#current-instance").text();
|
72
72
|
$.ajax({
|
73
73
|
type: "PUT",
|
74
74
|
url: url + "/properties/values/description/",
|
data/cockpit/js/instance.js
CHANGED
@@ -24,6 +24,8 @@ var sub_more = 'topic' + '=' + 'activity' + '&' +// {{{
|
|
24
24
|
'events' + '=' + 'change' + '&' +
|
25
25
|
'topic' + '=' + 'endpoints' + '&' +
|
26
26
|
'events' + '=' + 'change' + '&' +
|
27
|
+
'topic' + '=' + 'attributes' + '&' +
|
28
|
+
'events' + '=' + 'change' + '&' +
|
27
29
|
'topic' + '=' + 'transformation' + '&' +
|
28
30
|
'events' + '=' + 'change' + '&' +
|
29
31
|
'topic' + '=' + 'handlerwrapper' + '&' +
|
@@ -42,6 +44,8 @@ var sub_less = 'topic' + '=' + 'activity' + '&' +// {{{
|
|
42
44
|
'events' + '=' + 'change' + '&' +
|
43
45
|
'topic' + '=' + 'endpoints' + '&' +
|
44
46
|
'events' + '=' + 'change' + '&' +
|
47
|
+
'topic' + '=' + 'attributes' + '&' +
|
48
|
+
'events' + '=' + 'change' + '&' +
|
45
49
|
'topic' + '=' + 'transformation' + '&' +
|
46
50
|
'events' + '=' + 'change' + '&' +
|
47
51
|
'topic' + '=' + 'handlerwrapper' + '&' +
|
@@ -52,7 +56,7 @@ var sub_less = 'topic' + '=' + 'activity' + '&' +// {{{
|
|
52
56
|
$(document).ready(function() {// {{{
|
53
57
|
$("input[name=base-url]").val(location.protocol + "//" + location.host + ":" + $('body').data('defaultport'));
|
54
58
|
$("button[name=base]").click(function(){ create_instance(null); });
|
55
|
-
$("button[name=instance]").click(function(){
|
59
|
+
$("button[name=instance]").click(function(){ ui_activate_tab("#tabinstance"); monitor_instance(false); });
|
56
60
|
$("button[name=loadtestset]").click(function(e){new CustomMenu(e).menu($('#predefinedtestsets'),load_testset); });
|
57
61
|
$("button[name=loadtestsetfile]").click(load_testsetfile);
|
58
62
|
$("button[name=loadmodelfile]").click(load_modelfile);
|
@@ -71,19 +75,23 @@ $(document).ready(function() {// {{{
|
|
71
75
|
var ts = $(this).text();
|
72
76
|
$('#predefinedtestsets').append($("<div class='menuitem'></div>").text(ts));
|
73
77
|
});
|
74
|
-
var q = $.
|
78
|
+
var q = $.parseQuerySimple();
|
75
79
|
if (q.monitor && q.load) {
|
76
80
|
$("input[name=instance-url]").val(q.monitor);
|
77
|
-
$("
|
78
|
-
|
81
|
+
$("#predefinedtestsets div.menuitem").each(function(k,v){
|
82
|
+
if ($(v).text() == q.load) { $(v).attr('data-selected','selected'); }
|
83
|
+
});
|
84
|
+
ui_activate_tab("#tabexecution");
|
79
85
|
monitor_instance(true);
|
80
86
|
} else if (q.load) {
|
81
|
-
$("
|
82
|
-
|
87
|
+
$("#predefinedtestsets div.menuitem").each(function(k,v){
|
88
|
+
if ($(v).text() == q.load) { $(v).attr('data-selected','selected'); }
|
89
|
+
});
|
90
|
+
ui_activate_tab("#tabexecution");
|
83
91
|
create_instance(q.load);
|
84
92
|
} else if (q.monitor) {
|
85
93
|
$("input[name=instance-url]").val(q.monitor);
|
86
|
-
|
94
|
+
ui_activate_tab("#tabexecution");
|
87
95
|
// ui_toggle_vis_tab($("#instance td.switch"));
|
88
96
|
monitor_instance(false);
|
89
97
|
}
|
@@ -216,6 +224,10 @@ function monitor_instance(load) {// {{{
|
|
216
224
|
case 'endpoints':
|
217
225
|
monitor_instance_endpoints();
|
218
226
|
break;
|
227
|
+
case 'attributes':
|
228
|
+
monitor_instance_attributes();
|
229
|
+
monitor_instance_transformation();
|
230
|
+
break;
|
219
231
|
case 'state':
|
220
232
|
monitor_instance_state_change(JSON.parse($('event > notification',data).text()).state);
|
221
233
|
break;
|
@@ -246,13 +258,14 @@ function monitor_instance(load) {// {{{
|
|
246
258
|
|
247
259
|
monitor_instance_dataelements();
|
248
260
|
monitor_instance_endpoints();
|
261
|
+
monitor_instance_attributes();
|
249
262
|
monitor_instance_transformation();
|
250
263
|
monitor_instance_dsl();
|
251
264
|
monitor_instance_state();
|
252
265
|
},
|
253
266
|
error: function(a,b,c) {
|
254
267
|
alert("This ain't no CPEE instance");
|
255
|
-
|
268
|
+
ui_activate_tab("#tabnew");
|
256
269
|
}
|
257
270
|
});
|
258
271
|
}// }}}
|
@@ -314,6 +327,35 @@ function monitor_instance_endpoints() {// {{{
|
|
314
327
|
});
|
315
328
|
}// }}}
|
316
329
|
|
330
|
+
function monitor_instance_attributes() {// {{{
|
331
|
+
var url = $("#current-instance").text();
|
332
|
+
$.ajax({
|
333
|
+
type: "GET",
|
334
|
+
url: url + "/properties/values/attributes/",
|
335
|
+
success: function(res){
|
336
|
+
var values = $("value > *",res);
|
337
|
+
var temp = {}
|
338
|
+
values.each(function(){
|
339
|
+
temp[this.nodeName] = $(this).text();
|
340
|
+
});
|
341
|
+
var temp_xml = serialize_hash(temp);
|
342
|
+
|
343
|
+
if (temp_xml != save['attributes']) {
|
344
|
+
save['attributes'] = temp_xml;
|
345
|
+
var ctv = $("#dat_attributes");
|
346
|
+
ctv.empty();
|
347
|
+
$.each(temp,function(a,b){
|
348
|
+
var node = $("#dat_template_pair tr").clone(true);
|
349
|
+
$('.pair_name',node).val(a);
|
350
|
+
$('.pair_value',node).val(b);
|
351
|
+
ctv.append(node);
|
352
|
+
});
|
353
|
+
ctv.append(temp);
|
354
|
+
}
|
355
|
+
}
|
356
|
+
});
|
357
|
+
}// }}}
|
358
|
+
|
317
359
|
function monitor_instance_dsl() {// {{{
|
318
360
|
var url = $("#current-instance").text();
|
319
361
|
$.ajax({
|
@@ -654,7 +696,6 @@ function set_testset(testset) {// {{{
|
|
654
696
|
|
655
697
|
function load_testsetfile_after() { //{{{
|
656
698
|
if (running) return;
|
657
|
-
console.log('rrrr');
|
658
699
|
running = true;
|
659
700
|
if (typeof window.FileReader !== 'function') {
|
660
701
|
alert('FileReader not yet supportet');
|
data/cockpit/js/parameters.js
CHANGED
@@ -1,49 +1,50 @@
|
|
1
1
|
$(document).ready(function() {
|
2
2
|
// Color of save buttons for parameter area //{{{
|
3
|
-
$('#parameters
|
4
|
-
mark_parameters_save($(event.target).parents('
|
3
|
+
$('#parameters ui-tabbar ui-tab:not(.switch)').click(function(event){
|
4
|
+
mark_parameters_save($(event.target).parents('ui-tabbed'));
|
5
5
|
}); //}}}
|
6
6
|
|
7
7
|
// Delete entries //{{{
|
8
8
|
$(document).on('click','#parameters td.del a',function(event){
|
9
|
-
var top = $(event.target).parents('
|
9
|
+
var top = $(event.target).parents('ui-tabbed');
|
10
10
|
remove_entry($("input",$(event.target).parents('tr')).get(0),false);
|
11
11
|
mark_parameters_save(top);
|
12
12
|
return false;
|
13
13
|
}); //}}}
|
14
14
|
|
15
15
|
// New entry //{{{
|
16
|
-
$('#parameters
|
17
|
-
new_entry($(this).parents('
|
16
|
+
$('#parameters ui-behind button:nth-child(1)').click(function(){
|
17
|
+
new_entry($(this).parents('ui-tabbed'));
|
18
18
|
}); //}}}
|
19
19
|
|
20
20
|
// Save entries //{{{
|
21
|
-
$('#parameters
|
22
|
-
save_parameters($(event.target).parents('
|
21
|
+
$('#parameters ui-behind button:nth-child(2)').click(function(event){
|
22
|
+
save_parameters($(event.target).parents('ui-tabbed'));
|
23
23
|
}); //}}}
|
24
24
|
|
25
|
-
$(document).on('keyup','#dat_dataelements input',function(e){ mark_parameters_save($(e.target).parents('
|
26
|
-
$(document).on('keyup','#dat_endpoints input',function(e){ mark_parameters_save($(e.target).parents('
|
25
|
+
$(document).on('keyup','#dat_dataelements input',function(e){ mark_parameters_save($(e.target).parents('ui-tabbed')); });
|
26
|
+
$(document).on('keyup','#dat_endpoints input',function(e){ mark_parameters_save($(e.target).parents('ui-tabbed')); });
|
27
|
+
$(document).on('keyup','#dat_attributes input',function(e){ mark_parameters_save($(e.target).parents('ui-tabbed')); });
|
27
28
|
});
|
28
29
|
|
29
30
|
function mark_parameters_save(top) { //{{{
|
30
|
-
var visid = $('
|
31
|
+
var visid = $('ui-tabbar ui-tab',top).not('.switch').not('.inactive').attr('data-tab');
|
31
32
|
var tab = $('#dat_' + visid);
|
32
33
|
if (serialize_inputs(tab) != save[visid]) {
|
33
|
-
$('
|
34
|
+
$('ui-tabbar ui-behind button:nth-child(2)',top).addClass('highlight');
|
34
35
|
} else {
|
35
|
-
$('
|
36
|
+
$('ui-tabbar ui-behind button:nth-child(2)',top).removeClass('highlight');
|
36
37
|
}
|
37
38
|
} //}}}
|
38
39
|
function save_parameters(top) { //{{{
|
39
|
-
var visid = $('
|
40
|
+
var visid = $('ui-tabbar ui-tab',top).not('.switch').not('.inactive').attr('id').replace(/tab/,'');
|
40
41
|
var table = $('#dat_' + visid);
|
41
42
|
var serxml = serialize_inputs(table);
|
42
43
|
|
43
44
|
if (serxml != save[visid]) {
|
44
45
|
save[visid] = serxml;
|
45
|
-
var url = $("
|
46
|
-
$('
|
46
|
+
var url = $("#current-instance").text();
|
47
|
+
$('ui-tabbar ui-behind button:nth-child(2)',top).removeClass('highlight');
|
47
48
|
$.ajax({
|
48
49
|
type: "PUT",
|
49
50
|
url: url + "/properties/values/" + visid + "/",
|
data/cockpit/js/ui.js
CHANGED
@@ -23,9 +23,6 @@ $(document).ready(function() {
|
|
23
23
|
location.reload();
|
24
24
|
});
|
25
25
|
}
|
26
|
-
|
27
|
-
// Resize areas
|
28
|
-
$('#parameters .tabbelow').resizable();
|
29
26
|
});
|
30
27
|
|
31
28
|
// flexible parameter input
|
@@ -46,7 +43,7 @@ function remove_entry(target,foc) { //{{{
|
|
46
43
|
} //}}}
|
47
44
|
|
48
45
|
function new_entry(top) { //{{{
|
49
|
-
var visid = $('
|
46
|
+
var visid = $('ui-tabbar ui-tab',top).not('.switch').not('.inactive').attr('id').replace(/tab/,'');
|
50
47
|
var node = $('#dat_template_pair tr').clone();
|
51
48
|
var vnode = $('#dat_' + visid).append(node);
|
52
49
|
$('.pair_name',vnode).focus();
|