diff --git a/v1/resources/bookmark_ls.cfc b/v1/resources/bookmark_ls.cfc index 2c03650..7bf9dd4 100644 --- a/v1/resources/bookmark_ls.cfc +++ b/v1/resources/bookmark_ls.cfc @@ -146,8 +146,8 @@ , , - , - , + , + , , , , diff --git a/v1/resources/instance.cfc b/v1/resources/instance.cfc index 562203a..2c335fa 100644 --- a/v1/resources/instance.cfc +++ b/v1/resources/instance.cfc @@ -152,6 +152,7 @@ o.is_successful to_char(o.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_created o.error_log + o.note u.login as updater_login u.shortname as updater_shortname coalesce((o.dt_start IS NOT NULL AND o.dt_finish IS NULL AND o.submit_result='201'),false) as is_in_progress @@ -410,13 +411,13 @@ dt_updated= ,updater_id= - ,display_name= + ,display_name= - ,descr= + ,descr= where instance_uid=; --select @@rowcount as cnt; diff --git a/v1/resources/instance_ls.cfc b/v1/resources/instance_ls.cfc index 48a17f6..9d73248 100644 --- a/v1/resources/instance_ls.cfc +++ b/v1/resources/instance_ls.cfc @@ -382,10 +382,10 @@ values ( - , + , , , - , + , , , , diff --git a/v1/resources/instance_operation.cfc b/v1/resources/instance_operation.cfc index 586418c..90e1176 100644 --- a/v1/resources/instance_operation.cfc +++ b/v1/resources/instance_operation.cfc @@ -30,6 +30,7 @@ to_char(o.dt_submit, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_submit o.submit_result o.error_log + o.note 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 diff --git a/v1/resources/instance_operation_cfs_param.cfc b/v1/resources/instance_operation_cfs_param.cfc index 929b6ca..10dfdea 100644 --- a/v1/resources/instance_operation_cfs_param.cfc +++ b/v1/resources/instance_operation_cfs_param.cfc @@ -202,8 +202,8 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In update instance_operation_cfs_param set dt_created= ,creator_id= - ,param_value= - ,note= + ,param_value= + ,note= where instance_operation_cfs_param_uid= diff --git a/v1/resources/instance_operation_cfs_param_ls.cfc b/v1/resources/instance_operation_cfs_param_ls.cfc index f326046..0c72d58 100644 --- a/v1/resources/instance_operation_cfs_param_ls.cfc +++ b/v1/resources/instance_operation_cfs_param_ls.cfc @@ -232,8 +232,8 @@ arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //In , , - , - , + , + , , , ); diff --git a/v1/resources/instance_operation_cfs_subparam_ls.cfc b/v1/resources/instance_operation_cfs_subparam_ls.cfc index 4a98297..d8099ed 100644 --- a/v1/resources/instance_operation_cfs_subparam_ls.cfc +++ b/v1/resources/instance_operation_cfs_subparam_ls.cfc @@ -59,9 +59,9 @@ values ( - , + , , - , + , , , , diff --git a/v1/resources/instance_operation_ls.cfc b/v1/resources/instance_operation_ls.cfc index f7a8b80..6738cdb 100644 --- a/v1/resources/instance_operation_ls.cfc +++ b/v1/resources/instance_operation_ls.cfc @@ -27,7 +27,8 @@ "display_name"={prefix="e", type="string"}, "service_id"={prefix="e", type="integer"}, "svc"={prefix="v", type="string"}, - "operation"={prefix="o", type="string"}, + "error_log"={prefix="o", type="string"}, + "note"={prefix="o", type="string"}, "duration"={expression="extract('epoch' from coalesce(o.dt_finish,CURRENT_TIMESTAMP)- o.dt_start)", type="numeric"} }/> @@ -70,7 +71,7 @@ to_char(o.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_created to_char(o.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_updated to_char(o.dt_submit, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_submit - o.submit_result + 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 @@ -78,6 +79,8 @@ e.display_name e.service_id v.svc + o.error_log + o.note i.specification_item_id s.specification_id d.contract_id @@ -167,6 +170,7 @@ + @@ -214,12 +218,13 @@ insert into instance_operation - (instance_uid, instance_operation_uid, operation, dt_created, creator_id, dt_updated, updater_id) + (instance_uid, instance_operation_uid, operation, note, dt_created, creator_id, dt_updated, updater_id) values ( , , + , , , ,