From e51a2c0cf57096f027e2e285dac2528dde43d724 Mon Sep 17 00:00:00 2001 From: msyu Date: Mon, 19 May 2025 15:48:41 +0300 Subject: [PATCH] 109 cfs subparams --- v1/Application.cfc | 2 +- v1/resources/bookmark_ls.cfc | 2 +- v1/resources/instance_operation.cfc | 54 +---- v1/resources/instance_operation_cfs_param.cfc | 218 +++++++++++------- .../instance_operation_cfs_param_ls.cfc | 37 ++- v1/resources/instance_operation_default.cfc | 18 +- 6 files changed, 194 insertions(+), 137 deletions(-) diff --git a/v1/Application.cfc b/v1/Application.cfc index b15dd17..85bff07 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.108"; /*$ git config --global --unset user.password*/ + variables.framework.docs.APIVersion="0.109"; /*$ git config --global --unset user.password*/ variables.framework.globalHeaders = structNew(); diff --git a/v1/resources/bookmark_ls.cfc b/v1/resources/bookmark_ls.cfc index 36dfa71..2c03650 100644 --- a/v1/resources/bookmark_ls.cfc +++ b/v1/resources/bookmark_ls.cfc @@ -74,7 +74,7 @@ where 1=1 AND (b.contragent_id = OR b.contragent_id=-1)/*общая букмарка*/ - order by sort desc + order by b.contragent_id desc, b.sort asc limit #maxrows# diff --git a/v1/resources/instance_operation.cfc b/v1/resources/instance_operation.cfc index 74bbc64..038980b 100644 --- a/v1/resources/instance_operation.cfc +++ b/v1/resources/instance_operation.cfc @@ -146,15 +146,17 @@ "svcId":#local.qInstanceOperation.service_id#, "contractId":#arguments.contractId# }/> - - + + + - + - + + @@ -250,47 +252,7 @@ - - - - - - - - select distinct r.resource_realm, r.sort - from resource_realm r - join resource_realm_access a on - (r.resource_realm_id=a.resource_realm_id - AND (a.contract_id= - OR a.contract_id=0) /*0 means access to any contract*/ - AND a.is_enabled) - join svc s on r.resource_realm_type_id=s.resource_realm_type_id - where s.svc_id= - order by r.sort, r.resource_realm - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/v1/resources/instance_operation_cfs_param.cfc b/v1/resources/instance_operation_cfs_param.cfc index 6f3e8d2..af20225 100644 --- a/v1/resources/instance_operation_cfs_param.cfc +++ b/v1/resources/instance_operation_cfs_param.cfc @@ -22,7 +22,7 @@ - + select iop.instance_operation_cfs_param_uid::text as instance_operation_cfs_param_uid @@ -36,9 +36,11 @@ sop.svc_operation_cfs_param sop.data_type null as data_descriptor + sop.value_list u.login as creator_login u.shortname as creator_shortname sop.is_sensitive + sop.func from instance_operation_cfs_param iop join svc_operation_cfs_param sop on (iop.svc_operation_cfs_param_id=sop.svc_operation_cfs_param_id) @@ -50,89 +52,32 @@ AND si.specification_id= - + + + + + + + + + + + + + + - - - - - - - - - - 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 - - - - - - - - - - - - - - - - - - - - - - @@ -222,5 +167,124 @@ + + + + + + + + + + + + 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select distinct r.resource_realm, r.sort + from resource_realm r + join resource_realm_access a on + (r.resource_realm_id=a.resource_realm_id + AND (a.contract_id= + OR a.contract_id=0) /*0 means access to any contract*/ + AND a.is_enabled) + join svc s on r.resource_realm_type_id=s.resource_realm_type_id + where s.svc_id= + order by r.sort, r.resource_realm + + + \ No newline at end of file diff --git a/v1/resources/instance_operation_cfs_param_ls.cfc b/v1/resources/instance_operation_cfs_param_ls.cfc index 27b3b47..4f7793b 100644 --- a/v1/resources/instance_operation_cfs_param_ls.cfc +++ b/v1/resources/instance_operation_cfs_param_ls.cfc @@ -55,7 +55,8 @@ - + + select iop.instance_operation_cfs_param_uid::text as instance_operation_cfs_param_uid @@ -70,6 +71,12 @@ sop.svc_operation_cfs_param sop.sort sop.is_sensitive + sop.data_type + sop.value_list + sop.default_value + sop.func + null as data_descriptor + e.service_id from instance_operation_cfs_param iop join instance_operation io on (iop.instance_operation_uid=io.instance_operation_uid) @@ -89,18 +96,40 @@ from instance_operation_cfs_param iop where iop.instance_operation_uid= + + + + + + + + + + + + + + + + + + - + - + - + diff --git a/v1/resources/instance_operation_default.cfc b/v1/resources/instance_operation_default.cfc index 7cfdf17..cd7478f 100644 --- a/v1/resources/instance_operation_default.cfc +++ b/v1/resources/instance_operation_default.cfc @@ -111,16 +111,17 @@ "svcId":#local.qSvcOperation.svc_id#, "contractId":#arguments.contractId# }/> - - + + + - + - - + + select sp.svc_operation_cfs_param_id @@ -149,7 +150,8 @@ @@ -213,7 +215,7 @@ - + \ No newline at end of file