diff --git a/v1/Application.cfc b/v1/Application.cfc
index 3bcffe4..ca51ce9 100644
--- a/v1/Application.cfc
+++ b/v1/Application.cfc
@@ -51,7 +51,7 @@
//variables.framework.docs={};
variables.framework.docs.APIName="Deck API";
- variables.framework.docs.APIVersion="0.102";
+ variables.framework.docs.APIVersion="0.103";
variables.framework.globalHeaders = structNew();
variables.framework.globalHeaders["Access-Control-Expose-Headers"] = "Location";
diff --git a/v1/resources/bookmark.cfc b/v1/resources/bookmark.cfc
index df469ea..0f9201e 100644
--- a/v1/resources/bookmark.cfc
+++ b/v1/resources/bookmark.cfc
@@ -3,7 +3,56 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ select
+
+ b.bookmark_uid::text as bookmark_uid
+ b.bookmark
+ b.descr
+ b.url
+ b.icon_url
+ b.contragent_id
+ b.is_enabled
+ to_char(b.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_created
+ to_char(b.dt_updated, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_updated
+
+ from bookmark b
+ where b.bookmark_uid=
+ AND (b.contragent_id = )
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/v1/resources/bookmark_ls.cfc b/v1/resources/bookmark_ls.cfc
index 856b627..4544baf 100644
--- a/v1/resources/bookmark_ls.cfc
+++ b/v1/resources/bookmark_ls.cfc
@@ -27,8 +27,9 @@
+
-
+
@@ -39,7 +40,7 @@
-
+
@@ -143,9 +144,9 @@
,
,
- ,
,
,
+ ,
,
,
,
diff --git a/v1/resources/instance_operation.cfc b/v1/resources/instance_operation.cfc
index a48d1a5..f0b6561 100644
--- a/v1/resources/instance_operation.cfc
+++ b/v1/resources/instance_operation.cfc
@@ -113,6 +113,7 @@
sop.svc_operation_cfs_param
sop.label
sop.data_type
+ null as data_descriptor
sop.value_list
sop.ref_svc_id
sop.func
@@ -149,9 +150,81 @@
-
-
+
+
+
+
+
+
+
+
+
+
+ select
+ sp.svc_operation_cfs_param_id
+ ,sp.svc_operation_cfs_subparam_id
+ ,sp.svc_operation_cfs_subparam
+ ,sp.label
+ ,sp.data_type
+ ,sp.value_list
+ ,sp.is_required
+ ,sp.descr
+ ,sp.man
+ ,sp.default_value
+ ,sp.minlength
+ ,sp.maxlength
+ ,sp.regex
+ ,sp.sort
+ ,sp.is_sensitive
+ from svc_operation_cfs_subparam sp
+ where sp.svc_operation_cfs_param_id=
+ order by sp.sort
+
+
+
+ select
+ sp.instance_operation_cfs_param_uid::text as instance_operation_cfs_param_uid
+ ,sp.instance_operation_cfs_subparam
+ ,sp.descr
+ ,sp.sort
+ ,sp.is_sensitive
+ from instance_operation_cfs_subparam sp
+ where sp.instance_operation_cfs_param_uid=
+ order by sp.sort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/v1/resources/instance_operation_cfs_param.cfc b/v1/resources/instance_operation_cfs_param.cfc
index 5437fe6..4de2c91 100644
--- a/v1/resources/instance_operation_cfs_param.cfc
+++ b/v1/resources/instance_operation_cfs_param.cfc
@@ -20,6 +20,8 @@
+
+
select
@@ -32,6 +34,8 @@
to_char(iop.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_created
iop.creator_id
sop.svc_operation_cfs_param
+ sop.data_type
+ null as data_descriptor
u.login as creator_login
u.shortname as creator_shortname
sop.is_sensitive
@@ -50,6 +54,80 @@
+
+
+
+
+
+
+
+
+
+ select
+ sp.svc_operation_cfs_param_id
+ ,sp.svc_operation_cfs_subparam_id
+ ,sp.svc_operation_cfs_subparam
+ ,sp.label
+ ,sp.data_type
+ ,sp.value_list
+ ,sp.is_required
+ ,sp.descr
+ ,sp.man
+ ,sp.default_value
+ ,sp.minlength
+ ,sp.maxlength
+ ,sp.regex
+ ,sp.sort
+ ,sp.is_sensitive
+ from svc_operation_cfs_subparam sp
+ where sp.svc_operation_cfs_param_id=
+ order by sp.sort
+
+
+
+ select
+ sp.instance_operation_cfs_param_uid::text as instance_operation_cfs_param_uid
+ ,sp.instance_operation_cfs_subparam
+ ,sp.note
+ ,sp.sort
+ ,sp.is_sensitive
+ from instance_operation_cfs_subparam sp
+ where sp.instance_operation_cfs_param_uid=
+ order by sp.sort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/v1/resources/instance_operation_cfs_subparam.cfc b/v1/resources/instance_operation_cfs_subparam.cfc
new file mode 100644
index 0000000..4864bde
--- /dev/null
+++ b/v1/resources/instance_operation_cfs_subparam.cfc
@@ -0,0 +1,176 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ select
+
+ ios.instance_operation_cfs_param_uid::text as instance_operation_cfs_param_uid
+ ios.instance_operation_cfs_subparam
+ ios.is_sensitive
+ ios.note
+
+ to_char(ios.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_created
+
+ from instance_operation_cfs_subparam ios
+ join instance_operation_cfs_param iop on (ios.instance_operation_cfs_param_uid=iop.instance_operation_cfs_param_uid)
+ join instance_operation io on (iop.instance_operation_uid=io.instance_operation_uid)
+ join instance e on (io.instance_uid=e.instance_uid)
+ join specification_item si on (e.specification_item_id=si.specification_item_id)
+ where ios.instance_operation_cfs_param_uid=
+ AND ios.instance_operation_cfs_subparam=
+ AND si.specification_id= /*tenant isolation, из конфиденциального тут заметки... может быть, имена переменных окружения*/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ select ios.instance_operation_cfs_subparam
+ from instance_operation_cfs_subparam ios
+ where ios.instance_operation_cfs_param_uid=
+ AND ios.instance_operation_cfs_subparam=
+
+
+
+
+
+
+ select iop.instance_operation_cfs_subparam
+ from instance_operation_cfs_subparam ios
+ join instance_operation_cfs_param iop on (ios.instance_operation_cfs_param_uid=iop.instance_operation_cfs_param_uid)
+ join instance_operation io on (iop.instance_operation_uid=io.instance_operation_uid)
+ join instance e on (io.instance_uid=e.instance_uid)
+ join specification_item si on (e.specification_item_id=si.specification_item_id)
+ where ios.instance_operation_cfs_param_uid=
+ AND ios.instance_operation_cfs_subparam=
+ AND si.specification_id=
+
+
+
+
+
+
+ delete from instance_operation_cfs_subparam
+ where instance_operation_cfs_param_uid=
+ AND instance_operation_cfs_subparam=
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ select iop.instance_operation_cfs_subparam
+ from instance_operation_cfs_subparam iop
+ where iop.instance_operation_cfs_param_uid=
+ AND iop.instance_operation_cfs_subparam=
+
+
+
+
+
+
+ select iop.instance_operation_cfs_subparam
+ from instance_operation_cfs_subparam ios
+ join instance_operation_cfs_param iop on (ios.instance_operation_cfs_param_uid=iop.instance_operation_cfs_param_uid)
+ join instance_operation io on (iop.instance_operation_uid=io.instance_operation_uid)
+ join instance e on (io.instance_uid=e.instance_uid)
+ join specification_item si on (e.specification_item_id=si.specification_item_id)
+ where iop.instance_operation_cfs_param_uid=
+ AND iop.instance_operation_cfs_subparam=
+ AND si.specification_id=
+
+
+
+
+
+
+ update instance_operation_cfs_subparam set
+ dt_updated=
+ ,updater_id=
+ ,is_sensitive=
+ ,note=
+ where instance_operation_cfs_param_uid=
+ AND iop.instance_operation_cfs_subparam=
+
+
+
+
+
+
\ No newline at end of file
diff --git a/v1/resources/instance_operation_default.cfc b/v1/resources/instance_operation_default.cfc
index 681b87a..7cfdf17 100644
--- a/v1/resources/instance_operation_default.cfc
+++ b/v1/resources/instance_operation_default.cfc
@@ -70,6 +70,7 @@
p.svc_operation_cfs_param
p.label
p.data_type
+ null as data_descriptor
p.value_list
>p.func
p.ref_svc_id
@@ -116,6 +117,47 @@
+
+
+
+
+
+ select
+ sp.svc_operation_cfs_param_id
+ ,sp.svc_operation_cfs_subparam_id
+ ,sp.svc_operation_cfs_subparam
+ ,sp.label
+ ,sp.data_type
+ ,sp.value_list
+ ,sp.is_required
+ ,sp.descr
+ ,sp.man
+ ,sp.default_value
+ ,sp.minlength
+ ,sp.maxlength
+ ,sp.regex
+ ,sp.sort
+ ,sp.is_sensitive
+ from svc_operation_cfs_subparam sp
+ where sp.svc_operation_cfs_param_id=
+ order by sp.sort
+
+
+
+
+
+
+
+
+
+
+