Index: openacs-4/packages/assessment/tcl/as-checks-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-checks-procs-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/tcl/as-checks-procs-oracle.xql 24 Jan 2005 17:59:52 -0000 1.1
+++ openacs-4/packages/assessment/tcl/as-checks-procs-oracle.xql 29 Jan 2005 18:03:12 -0000 1.2
@@ -4,17 +4,75 @@
- select nextval('as_actions_log_action_log_id')
+ select action_log_id_seq.nextval from dual
+
+
+ select action_log_id_seq.nextval from dual
+
+
-
+
+
- select nextval('as_actions_log_action_log_id')
+ declare begin
+ :1 := as_inter_item_check.new (
+ inter_item_check_id => null,
+ name => :name,
+ action_p => :action_p,
+ section_id_from => :section_id_from,
+ section_id_to => :section_id_to,
+ check_sql => :check_sql,
+ description => :description,
+ postcheck_p => :postcheck_p,
+ item_id => null,
+ assessment_id => :assessment_id,
+ creation_user => :user_id,
+ context_id => null,
+ object_type => 'as_inter_item_checks',
+ creation_date => :date
+ );
+ end;
+
+
+ begin
+ as_inter_item_check.delete(:check_id);
+ end;
+
+
+
+
+
+
+
+ select to_date(sysdate,'YYYY-MM-DD') as today, to_date(sysdate-1,'YYYY-MM-DD') as yesterday, to_date (sysdate-2,'YYYY-MM-DD') as two_days,to_date (sysdate-7,'YYYY-MM-DD') as last_week, to_date (sysdate-30,'YYYY-MM-DD') as last_month from dual
+
+
+
+
+
+ update as_actions_log set failed_p=:failed_p,date_processed=(select sysdate from dual),finally_executed_by=:user_id,approved_p='t' where action_log_id=:action_log_id
+
+
+
+
+
+ insert into as_actions_log (action_log_id,inter_item_check_id,action_id,date_requested,date_processed,approved_p,failed_p,finally_executed_by,session_id) values (:log_id,:check_id,:action_id,(select sysdate from dual),(select sysdate from dual),'t',:failed,:user_id,:session_id)
+
+
+
+
+
+ insert into as_actions_log (action_log_id,inter_item_check_id,action_id,date_requested,date_processed,approved_p,failed_p,finally_executed_by,session_id) values (:log_id,:check_id,:action_id,(select sysdate from dual),null,'f','f',null,:session_id)
+
+
+
+
\ No newline at end of file
Index: openacs-4/packages/assessment/tcl/as-checks-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-checks-procs-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/tcl/as-checks-procs-postgresql.xql 28 Jan 2005 20:31:32 -0000 1.3
+++ openacs-4/packages/assessment/tcl/as-checks-procs-postgresql.xql 29 Jan 2005 18:03:12 -0000 1.4
@@ -40,4 +40,23 @@
+
+
+ update as_actions_log set failed_p=:failed_p,date_processed=now(),finally_executed_by=:user_id,approved_p='t' where action_log_id=:action_log_id
+
+
+
+
+
+ insert into as_actions_log (action_log_id,inter_item_check_id,action_id,date_requested,date_processed,approved_p,failed_p,finally_executed_by,session_id) values (:log_id,:check_id,:action_id,now(),now(),'t',:failed,:user_id,:session_id)
+
+
+
+
+
+ insert into as_actions_log (action_log_id,inter_item_check_id,action_id,date_requested,date_processed,approved_p,failed_p,finally_executed_by,session_id) values (:log_id,:check_id,:action_id,now(),null,'f','f',null,:session_id)
+
+
+
+
\ No newline at end of file
Index: openacs-4/packages/assessment/tcl/as-checks-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-checks-procs.xql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/assessment/tcl/as-checks-procs.xql 28 Jan 2005 20:31:32 -0000 1.5
+++ openacs-4/packages/assessment/tcl/as-checks-procs.xql 29 Jan 2005 18:03:12 -0000 1.6
@@ -8,7 +8,13 @@
+
+
+ select inter_item_check_id,action_p,check_sql,postcheck_p,section_id_from,section_id_to,item_id,name,description,assessment_id from as_inter_item_checks where section_id_from=:section_id and assessment_id=:assessment_id
+
+
+
select max(am.order_by) from as_action_map am,as_inter_item_checks c
@@ -123,11 +129,6 @@
-
-
- insert into as_actions_log (action_log_id,inter_item_check_id,action_id,date_requested,date_processed,approved_p,failed_p,finally_executed_by,session_id) values (:log_id,:check_id,:action_id,now(),now(),'t',:failed,:user_id,:session_id)
-
-
@@ -136,11 +137,6 @@
-
-
- insert into as_actions_log (action_log_id,inter_item_check_id,action_id,date_requested,date_processed,approved_p,failed_p,finally_executed_by,session_id) values (:log_id,:check_id,:action_id,now(),null,'f','f',null,:session_id)
-
-
@@ -209,11 +205,6 @@
-
-
- update as_actions_log set failed_p=:failed_p,date_processed=now(),finally_executed_by=:user_id,approved_p='t' where action_log_id=:action_log_id
-
-
Index: openacs-4/packages/assessment/tcl/as-install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-install-procs.tcl,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/assessment/tcl/as-install-procs.tcl 24 Jan 2005 14:54:30 -0000 1.21
+++ openacs-4/packages/assessment/tcl/as-install-procs.tcl 29 Jan 2005 18:03:12 -0000 1.22
@@ -16,6 +16,8 @@
} {
Creates the content type and adds in attributes.
} {
+
+inter_item_checks::apm_callback::package_install
content::type::new -content_type {as_item_choices} -supertype {content_revision} -pretty_name {Assessment Item Choice} -pretty_plural {Assessment Item Choices} -table_name {as_item_choices} -id_column {choice_id}
content::type::new -content_type {as_item_sa_answers} -supertype {content_revision} -pretty_name {Assessment Item Answer} -pretty_plural {Assessment Item Answer} -table_name {as_item_sa_answers} -id_column {choice_id}
@@ -197,28 +199,7 @@
content::type::attribute::new -content_type {as_item_data} -attribute_name {signed_data} -datatype {string} -pretty_name {Signed Data} -column_spec {varchar(500)}
content::type::attribute::new -content_type {as_item_data} -attribute_name {points} -datatype {number} -pretty_name {Points awarded} -column_spec {integer}
-# notification init
-set impl_id [acs_sc::impl::new -contract_name NotificationType -name assessment_response_notif_type -owner assessment]
-acs_sc::impl::alias::new -contract_name NotificationType -impl_name assessment_response_notif_type -operation GetURL -alias as::notification::get_url -language TCL
-acs_sc::impl::alias::new -contract_name NotificationType -impl_name assessment_response_notif_type -operation ProcessReply -alias as::notification::process_reply -language TCL
-acs_sc::impl::binding::new -contract_name NotificationType -impl_name assessment_response_notif_type
-set type_id [notification::type::new -sc_impl_id $impl_id -short_name assessment_response_notif -pretty_name "Survey Response Notification" -description "Notifications for Assessment"]
-
-db_dml insert_intervals {
- insert into notification_types_intervals
- (type_id, interval_id)
- select :type_id as type_id, interval_id
- from notification_intervals
- where name in ('instant','hourly','daily')
}
-db_dml insert_delivery_method {
- insert into notification_types_del_methods
- (type_id, delivery_method_id)
- select :type_id as type_id, delivery_method_id
- from notification_delivery_methods
- where short_name = 'email'
-}
-}
ad_proc -public as::install::package_instantiate {
-package_id:required