From e815fa201e4f551c6d1c74217dfa0774f644bf29 Mon Sep 17 00:00:00 2001
From: msyu <msyu@mail.ru>
Date: Sat, 28 Dec 2024 15:44:19 +0300
Subject: [PATCH] 041 instanceOperation.errorLog

---
 .gitignore                          | 1 +
 v1/Application.cfc                  | 2 +-
 v1/resources/instance_operation.cfc | 8 +-------
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8539199..7b2add7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 v1/etc/
+v1/etc/local-debug
 build/manifests/
diff --git a/v1/Application.cfc b/v1/Application.cfc
index 4a65b3d..05f8bd1 100644
--- a/v1/Application.cfc
+++ b/v1/Application.cfc
@@ -71,7 +71,7 @@
 		
 		//variables.framework.docs={};
 		variables.framework.docs.APIName="Deck API";
-		variables.framework.docs.APIVersion="0.040";
+		variables.framework.docs.APIVersion="0.041";
 		
 		variables.framework.globalHeaders = structNew();
 		variables.framework.globalHeaders["Access-Control-Expose-Headers"] = "Location"; 
diff --git a/v1/resources/instance_operation.cfc b/v1/resources/instance_operation.cfc
index 2d450a6..b7f9484 100644
--- a/v1/resources/instance_operation.cfc
+++ b/v1/resources/instance_operation.cfc
@@ -25,22 +25,17 @@
 				<m:field title="instance_uid">o.instance_uid::text as instance_uid</m:field>
 				<m:field title="Отправка">to_char(o.dt_submit, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_submit</m:field>
 				<m:field title="Рез.">o.submit_result</m:field>
+				<m:field>o.error_log</m:field>
 				<m:field title="Начало">to_char(o.dt_start, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_start</m:field>
 				<m:field title="Завершение">to_char(o.dt_finish, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_finish</m:field>
 				<m:field title="Длит. сек">extract('epoch' from coalesce(o.dt_finish,CURRENT_TIMESTAMP)- o.dt_start) as duration</m:field>
-				<!--- <m:field title="Uptime">extract('epoch' from CURRENT_TIMESTAMP - coalesce(o.dt_finish,CURRENT_TIMESTAMP)) as uptime</m:field> --->
-				<!--- <m:field title="Длит.">(coalesce(dt_finish,CURRENT_TIMESTAMP)- dt_start) as duration_interval</m:field> --->
 				<m:field title="Успешно">o.is_successful</m:field>
-				<!--- <m:field title="stage">stage</m:field> --->
-			<!--- 	<m:field title="UID этапа">instance_operation_stage_uid</m:field> --->
 				<m:field title="Экземпляр">e.display_name</m:field>
 				<m:field title="service_id">e.service_id</m:field>
 				<m:field title="specification_item_id">e.specification_item_id</m:field>
-				<!--- <m:field title="descr">e.descr</m:field> --->
 				<m:field title="dt_created">to_char(o.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_created</m:field>	
 				<m:field title="Услуга">v.svc</m:field>
 				<m:field>so.svc_operation_id</m:field>
-				<!--- <m:field>(select instance_state_uid::text from instance_state ist where ist.instance_operation_uid=o.instance_operation_uid order by ist.version desc limit 1) as instance_state_uid</m:field> --->
 			</m:field_set>	
 			from instance_operation o
 			join instance e on (o.instance_uid=e.instance_uid)
@@ -48,7 +43,6 @@
 			join specification s on (i.specification_id=s.specification_id)		
 			join contract d on (s.contract_id=d.contract_id)		
 			join contragent k on (d.contragent_id=k.contragent_id)
-			<!--- join usr u on (k.contragent_id=u.contragent_id) --->	
 			join svc v on (e.service_id=v.svc_id)
 			join svc_operation so on (v.svc_id=so.svc_id AND o.operation=so.operation)
 			where <!--- u.usr_id=<cfqueryparam cfsqltype="cf_sql_integer" value=#arguments.usrId#/> AND--->