diff --git a/v1/Application.cfc b/v1/Application.cfc
index 94dae04..8683a46 100644
--- a/v1/Application.cfc
+++ b/v1/Application.cfc
@@ -87,7 +87,18 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/v1/resources/instance.cfc b/v1/resources/instance.cfc
index 00bea88..99454e5 100644
--- a/v1/resources/instance.cfc
+++ b/v1/resources/instance.cfc
@@ -55,7 +55,7 @@
st.version
st.creator_id
to_char(st.dt_state, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_state
- st.is_test
+ st.is_test
st.instance_operation_uid::text as instance_operation_uid
st.instance_data::text as instance_data
(st.instance_data->>'isDeleted')::boolean as is_deleted
@@ -80,16 +80,16 @@
o.instance_operation_uid::text as instance_operation_uid
status.instance_state_uid::text as instance_state_uid
- status.version as state_version
- o.operation
+ status.version as state_version
+ o.operation
- to_char(o.dt_submit, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_submit
- o.submit_result
- to_char(o.dt_start, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_start
- to_char(o.dt_finish, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_finish
- extract('epoch' from coalesce(o.dt_finish,CURRENT_TIMESTAMP)- o.dt_start) as duration
+ to_char(o.dt_submit, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_submit
+ o.submit_result
+ to_char(o.dt_start, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_start
+ to_char(o.dt_finish, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_finish
+ extract('epoch' from coalesce(o.dt_finish,CURRENT_TIMESTAMP)- o.dt_start) as duration
round(extract('epoch' from CURRENT_TIMESTAMP - coalesce(o.dt_finish,CURRENT_TIMESTAMP)),1) as seconds_passed
- o.is_successful
+ o.is_successful
to_char(o.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_created
o.error_log
diff --git a/v1/resources/instance_ls.cfc b/v1/resources/instance_ls.cfc
index 550762d..3971998 100644
--- a/v1/resources/instance_ls.cfc
+++ b/v1/resources/instance_ls.cfc
@@ -110,9 +110,9 @@
(select instance_data::text from instance_state st where st.instance_uid=e.instance_uid order by version desc limit 1) as instance_data
(select st.instance_state_uid::text from instance_state st where st.instance_uid=e.instance_uid order by version desc limit 1) as instance_state_uid
- (select st.is_test from instance_state st where st.instance_uid=e.instance_uid order by version desc limit 1) as is_test
- (select st.instance_data->>'isDeleted' from instance_state st where st.instance_uid=e.instance_uid order by version desc limit 1) as is_deleted
- (select st.instance_data->>'suspended' from instance_state st where st.instance_uid=e.instance_uid order by version desc limit 1) as suspended
+ (select st.is_test from instance_state st where st.instance_uid=e.instance_uid order by version desc limit 1) as is_test
+ (select st.instance_data->>'isDeleted' from instance_state st where st.instance_uid=e.instance_uid order by version desc limit 1) as is_deleted
+ (select st.instance_data->>'suspended' from instance_state st where st.instance_uid=e.instance_uid order by version desc limit 1) as suspended
(select to_char(st.dt_state, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') from instance_state st where st.instance_uid=e.instance_uid order by version desc limit 1) as dt_state
@@ -149,6 +149,7 @@
limit #maxrows#
+
select count(*) as cnt
@@ -176,8 +177,8 @@
-
-
+
+
diff --git a/v1/resources/instance_operation.cfc b/v1/resources/instance_operation.cfc
index b7f9484..54e72ff 100644
--- a/v1/resources/instance_operation.cfc
+++ b/v1/resources/instance_operation.cfc
@@ -29,7 +29,7 @@
to_char(o.dt_start, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_start
to_char(o.dt_finish, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_finish
extract('epoch' from coalesce(o.dt_finish,CURRENT_TIMESTAMP)- o.dt_start) as duration
- o.is_successful
+ o.is_successful
e.display_name
e.service_id
e.specification_item_id
@@ -60,7 +60,7 @@
ios.instance_operation_stage_uid::text as instance_operation_stage_uid
ios.stage
- ios.is_successful
+ ios.is_successful
to_char(ios.dt_start, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_start
to_char(ios.dt_finish, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_finish
round(extract('epoch' from coalesce(ios.dt_finish,CURRENT_TIMESTAMP)- ios.dt_start),1) as duration
@@ -78,7 +78,7 @@
st.version
st.creator_id
to_char(st.dt_state, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_state
- st.is_test
+ st.is_test
st.instance_operation_uid::text as instance_operation_uid
st.instance_data::text as instance_data
@@ -101,7 +101,7 @@
sop.data_type
sop.value_list
sop.ref_svc_id
- sop.is_required
+ sop.is_required
sop.default_value
sop.regex
sop.unique_scope
@@ -123,21 +123,21 @@
-
-
+
-
+
-
+
-
+
-
+
diff --git a/v1/resources/instance_operation_cfs_param_ls.cfc b/v1/resources/instance_operation_cfs_param_ls.cfc
index 7a80a15..beca36c 100644
--- a/v1/resources/instance_operation_cfs_param_ls.cfc
+++ b/v1/resources/instance_operation_cfs_param_ls.cfc
@@ -91,8 +91,8 @@
-
-
+
+
diff --git a/v1/resources/notification_ls.cfc b/v1/resources/notification_ls.cfc
index 99f684f..5b62c37 100644
--- a/v1/resources/notification_ls.cfc
+++ b/v1/resources/notification_ls.cfc
@@ -94,8 +94,8 @@
-
-
+
+
diff --git a/v1/resources/svc.cfc b/v1/resources/svc.cfc
index 9982eec..586e7bc 100644
--- a/v1/resources/svc.cfc
+++ b/v1/resources/svc.cfc
@@ -25,10 +25,10 @@
s.svc
s.svc_short
s.code
- (select url from svc_operation so where so.operation='create' AND so.svc_id=s.svc_id limit 1) as create_url
- s.is_production_ready
- s.descr
- s.man
+ (select url from svc_operation so where so.operation='create' AND so.svc_id=s.svc_id limit 1) as create_url
+ s.is_production_ready
+ s.descr
+ s.man
from svc s
where svc_id=
@@ -37,12 +37,11 @@
select
- j.svc_operation_id
-
- j.operation
- j.url
- j.descr
- j.man
+ j.svc_operation_id
+ j.operation
+ j.url
+ j.descr
+ j.man
from svc_operation j
where j.svc_id=
diff --git a/v1/resources/svc_default.cfc b/v1/resources/svc_default.cfc
index 11790f6..71f50e8 100644
--- a/v1/resources/svc_default.cfc
+++ b/v1/resources/svc_default.cfc
@@ -16,7 +16,7 @@
diff --git a/v1/resources/svc_ls.cfc b/v1/resources/svc_ls.cfc
index d78b9b4..27f0719 100644
--- a/v1/resources/svc_ls.cfc
+++ b/v1/resources/svc_ls.cfc
@@ -99,7 +99,7 @@
-
+
diff --git a/v1/resources/svc_operation.cfc b/v1/resources/svc_operation.cfc
index ff4d8f2..585b917 100644
--- a/v1/resources/svc_operation.cfc
+++ b/v1/resources/svc_operation.cfc
@@ -37,21 +37,21 @@
p.label
p.data_type
p.value_list
- p.ref_svc_id
- p.is_required
+ p.ref_svc_id
+ p.is_required
p.default_value
p.regex
p.unique_scope
p.descr
p.man
- (
+ (
select 1 from svc_operation_cfs_param m
join svc_operation om on m.svc_operation_id=om.svc_operation_id
join svc_operation oc on (om.svc_id=oc.svc_id AND om.operation='modify' AND oc.operation='create')
join svc_operation_cfs_param c on (oc.svc_operation_id=c.svc_operation_id AND m.svc_operation_cfs_param=c.svc_operation_cfs_param)
where c.svc_operation_cfs_param_id=p.svc_operation_cfs_param_id
limit 1
- ) as modifiable
+ ) as isModifiable
from svc_operation_cfs_param p
where p.svc_operation_id=