Index: openacs-4/packages/imsld/www/activity-frame.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/activity-frame.tcl,v
diff -u -N -r1.20 -r1.21
--- openacs-4/packages/imsld/www/activity-frame.tcl 14 Nov 2008 17:44:17 -0000 1.20
+++ openacs-4/packages/imsld/www/activity-frame.tcl 19 Feb 2009 13:07:26 -0000 1.21
@@ -19,40 +19,10 @@
set iframe_activity_url ""
set roles_template_p 0
-db_1row context_info {
- select r.imsld_id,
- case
- when exists (select 1 from imsld_learning_activities where activity_id = :activity_id)
- then 'learning'
- when exists (select 1 from imsld_support_activities where activity_id = :activity_id)
- then 'support'
- when exists (select 1 from imsld_activity_structures where structure_id = :activity_id)
- then 'structure'
- end as activity_type
- from imsld_runs r
- where run_id = :run_id
-}
+db_1row get_activity_type { *SQL* }
# make sure the activity is marked as started for this user
-db_dml mark_activity_started {
- insert into imsld_status_user (imsld_id,
- run_id,
- related_id,
- user_id,
- type,
- status_date,
- status)
- (
- select :imsld_id,
- :run_id,
- :activity_id,
- :user_id,
- :activity_type,
- now(),
- 'started'
- where not exists (select 1 from imsld_status_user where run_id = :run_id and user_id = :user_id and related_id = :activity_id and status = 'started')
- )
-}
+db_dml mark_activity_started { *SQL* }
set activity_item_id [content::revision::item_id -revision_id $activity_id]
@@ -62,79 +32,34 @@
if { [string eq "" [db_string completion_restriction {select complete_act_id from imsld_learning_activities where activity_id = :activity_id}]] } {
# the learning activity has been visited and doesn't have any completion restriction.
# if it is referenced from an activity structure, verify if every referenced activity have been visted
- db_0or1row referenced_from_structure_p {
- select ar.object_id_one as referencer_structure_item_id
- from acs_rels ar
- where ar.object_id_two = :activity_item_id
- }
+ db_0or1row referenced_from_structure_p { *SQL* }
}
} elseif { [string eq $activity_type "support"] } {
if { [string eq "" [db_string completion_restriction {select complete_act_id from imsld_support_activities where activity_id = :activity_id}]] } {
# the learning activity has been visited and doesn't have any completion restriction.
# if it is referenced from an activity structure, verify if every referenced activity have been visted
- db_0or1row referenced_from_structure_p {
- select ar.object_id_one as referencer_structure_item_id
- from acs_rels ar
- where ar.object_id_two = :activity_item_id
- }
+ db_0or1row referenced_from_structure_p { *SQL* }
}
}
if { ![string eq "" $referencer_structure_item_id] } {
- db_1row get_structure_info {
- select structure_id,
- number_to_select
- from imsld_activity_structuresi
- where item_id = :referencer_structure_item_id
- and content_revision__is_live(structure_id) = 't'
- }
+ db_1row get_structure_info { *SQL* }
# if the structure hasn't been finished
- if { ![db_0or1row already_finished {
- select 1
- from imsld_status_user
- where related_id = :structure_id
- and user_id = :user_id
- and run_id = :run_id
- and status = 'finished'
- }] } {
+ if { ![db_0or1row already_finished { *SQL* }] } {
set mark_structure_finished_p 1
set total_completed 0
- foreach referenced_activity [db_list_of_lists struct_referenced_activities {
- select ar.object_id_two,
- ar.rel_type
- from acs_rels ar
- where ar.object_id_one = :referencer_structure_item_id
- order by ar.object_id_two
- }] {
+ foreach referenced_activity [db_list_of_lists struct_referenced_activities { *SQL* }] {
set object_id_two [lindex $referenced_activity 0]
set rel_type [lindex $referenced_activity 1]
switch $rel_type {
imsld_as_la_rel {
# if the activity doesn't have any completrion restriction
# and it hasn't been started, cancel the completion of the structure
set referenced_activity_id [content::item::get_live_revision -item_id $object_id_two]
- set la_completion_restriction [db_string la_completion_restriction {
- select complete_act_id
- from imsld_learning_activities
- where activity_id = :referenced_activity_id
- }]
- if { ([db_0or1row la_already_started_p {
- select 1
- from imsld_status_user
- where related_id = :referenced_activity_id
- and user_id = :user_id
- and run_id = :run_id
- and status = 'started'
- }] && [string eq "" $la_completion_restriction]) \
- || [db_0or1row la_already_finished {
- select 1
- from imsld_status_user
- where related_id = :referenced_activity_id
- and user_id = :user_id
- and run_id = :run_id
- and status = 'finished'
- }] } {
+ set la_completion_restriction [db_string la_completion_restriction { *SQL* }]
+ if { ([db_0or1row la_already_started_p { *SQL* }] && [string eq "" $la_completion_restriction]) \
+ || [db_0or1row la_already_finished { *SQL* }] } {
# the activity has been visited
incr total_completed
} else {
@@ -146,22 +71,8 @@
# if the activity doesn't have any completrion restriction
# and it hasn't been started, cancel the completion of the structure
set referenced_activity_id [content::item::get_live_revision -item_id $object_id_two]
- if { ([db_0or1row la_already_started_p {
- select 1
- from imsld_status_user
- where related_id = :referenced_activity_id
- and user_id = :user_id
- and run_id = :run_id
- and status = 'started'
- }] && [string eq "" $sa_completion_restriction]) \
- || [db_0or1row la_already_finished {
- select 1
- from imsld_status_user
- where related_id = :referenced_activity_id
- and user_id = :user_id
- and run_id = :run_id
- and status = 'finished'
- }] } {
+ if { ([db_0or1row la_already_started_p { *SQL* }] && [string eq "" $sa_completion_restriction]) \
+ || [db_0or1row la_already_finished { *SQL* }] } {
# the activity has been visited
incr total_completed
} else {
@@ -171,14 +82,7 @@
} imsld_as_as_rel {
# if the referenced activity structure hasn't been finished, don't finish the activity structure
set structure_id [content::item::get_live_revision -item_id $object_id_two]
- if { ![db_0or1row sa_already_finished_p {
- select 1
- from imsld_status_user
- where related_id = :referenced_activity_id
- and user_id = :user_id
- and run_id = :run_id
- and status = 'finished'
- }] } {
+ if { ![db_0or1row la_already_finished_p { *SQL* }] } {
set mark_structure_finished_p 0
continue
} else {
@@ -192,14 +96,7 @@
set role_part_id_list [imsld::get_role_part_from_activity -activity_type structure -leaf_id $referencer_structure_item_id]
foreach role_part_id $role_part_id_list {
- db_1row context_info {
- select acts.act_id,
- plays.play_id
- from imsld_actsi acts, imsld_playsi plays, imsld_role_parts rp
- where rp.role_part_id = :role_part_id
- and rp.act_id = acts.item_id
- and acts.play_id = plays.item_id
- }
+ db_1row context_info { *SQL* }
imsld::finish_component_element -imsld_id $imsld_id \
-run_id $run_id \
@@ -215,14 +112,7 @@
}
}
-set supported_roles [db_list supported_roles_list { select iri.role_id
- from imsld_rolesi iri,
- acs_rels ar,
- imsld_support_activitiesi isai
- where iri.item_id=ar.object_id_two
- and ar.rel_type='imsld_sa_role_rel'
- and ar.object_id_one=isai.item_id
- and isai.activity_id =:activity_id }]
+set supported_roles [db_list supported_roles_list { *SQL* }]
if {[llength $supported_roles]} {
set roles_template_p 1
@@ -237,16 +127,7 @@
set activity_item_id [content::revision::item_id -revision_id $activity_id]
imsld::process_activity_as_ul -activity_item_id $activity_item_id -run_id $run_id -dom_doc $doc -dom_node $dom_root
- if { ![string eq $activity_id ""] && [db_0or1row get_table_name {
- select
- case
- when exists (select 1 from imsld_learning_activities where activity_id=:activity_id)
- then 'imsld_learning_activities'
- when exists (select 1 from imsld_support_activities where activity_id=:activity_id)
- then 'imsld_support_activities'
- end as table_name
- from dual
- }] && ![string eq "" $table_name] } {
+ if { ![string eq $activity_id ""] && [db_0or1row get_table_name { *SQL* }] && ![string eq "" $table_name] } {
#grant permissions to resources in activity
set resources_list [db_list get_resources_from_activity "
select ar2.object_id_two
@@ -262,28 +143,8 @@
if {[string eq 'imsld_learning_activities' $table_name]} {
- set prerequisites_list [db_list get_prerequisites_list "
- select ar2.object_id_two
- from acs_rels ar1,
- acs_rels ar2,
- $table_name tn
- where tn.activity_id=:activity_id
- and ar1.object_id_one=tn.prerequisite_id
- and ar1.rel_type='imsld_preq_item_rel'
- and ar1.object_id_two=ar2.object_id_one
- and ar2.rel_type='imsld_item_res_rel'
- "]
- set objectives_list [db_list get_objectives_list "
- select ar2.object_id_two
- from acs_rels ar1,
- acs_rels ar2,
- $table_name tn
- where tn.activity_id=:activity_id
- and ar1.object_id_one=tn.learning_objective_id
- and ar1.rel_type='imsld_lo_item_rel'
- and ar1.object_id_two=ar2.object_id_one
- and ar2.rel_type='imsld_item_res_rel'
- "]
+ set prerequisites_list [db_list get_prerequisites_list { *SQL* }]
+ set objectives_list [db_list get_objectives_list { *SQL* }]
} else {
set prerequisites_list [list]
set objectives_list [list]
@@ -308,30 +169,9 @@
} else {
# a user has been selected to be supported
# get the associated resource of the support activity
- db_1row activity_info {
- select ii.imsld_item_id
- from imsld_items ii, imsld_activity_descs sad, imsld_support_activities sa,
- cr_items cr1, cr_items cr2,
- acs_rels ar
- where sa.activity_id = :activity_id
- and sa.activity_description_id = cr1.item_id
- and cr1.live_revision = sad.description_id
- and ar.object_id_one = sa.activity_description_id
- and ar.object_id_two = cr2.item_id
- and cr2.live_revision = ii.imsld_item_id
- }
+ db_1row activity_info { *SQL* }
- db_1row support_activity_associated_item {
- select cpr.resource_id,
- cpr.item_id as resource_item_id,
- cpr.type as resource_type
- from imsld_cp_resourcesi cpr, imsld_itemsi ii,
- acs_rels ar
- where ar.object_id_one = ii.item_id
- and ar.object_id_two = cpr.item_id
- and content_revision__is_live(cpr.resource_id) = 't'
- and ii.imsld_item_id = :imsld_item_id
- }
+ db_1row support_activity_associated_item { *SQL* }
set activities [export_vars -base "imsld-content-serve" -url { run_id resource_item_id role_id {owner_user_id $supported_user_id} }]
Index: openacs-4/packages/imsld/www/activity-frame.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/activity-frame.xql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/imsld/www/activity-frame.xql 19 Feb 2009 13:07:26 -0000 1.1
@@ -0,0 +1,213 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ select r.imsld_id,
+ case
+ when exists (select 1 from imsld_learning_activities where activity_id = :activity_id)
+ then 'learning'
+ when exists (select 1 from imsld_support_activities where activity_id = :activity_id)
+ then 'support'
+ when exists (select 1 from imsld_activity_structures where structure_id = :activity_id)
+ then 'structure'
+ end as activity_type
+ from imsld_runs r
+ where run_id = :run_id
+
+
+
+
+
+ insert into imsld_status_user (imsld_id,
+ run_id,
+ related_id,
+ user_id,
+ type,
+ status_date,
+ status)
+ (
+ select :imsld_id,
+ :run_id,
+ :activity_id,
+ :user_id,
+ :activity_type,
+ now(),
+ 'started'
+ where not exists (select 1 from imsld_status_user where run_id = :run_id and user_id = :user_id and related_id = :activity_id and status = 'started')
+ )
+
+
+
+
+
+ select ar.object_id_one as referencer_structure_item_id
+ from acs_rels ar
+ where ar.object_id_two = :activity_item_id
+
+
+
+
+
+ select structure_id,
+ number_to_select
+ from imsld_activity_structuresi
+ where item_id = :referencer_structure_item_id
+ and content_revision__is_live(structure_id) = 't'
+
+
+
+
+
+ select 1
+ from imsld_status_user
+ where related_id = :structure_id
+ and user_id = :user_id
+ and run_id = :run_id
+ and status = 'finished'
+
+
+
+
+
+ select ar.object_id_two,
+ ar.rel_type
+ from acs_rels ar
+ where ar.object_id_one = :referencer_structure_item_id
+ order by ar.object_id_two
+
+
+
+
+
+ select complete_act_id
+ from imsld_learning_activities
+ where activity_id = :referenced_activity_id
+
+
+
+
+
+ select 1
+ from imsld_status_user
+ where related_id = :referenced_activity_id
+ and user_id = :user_id
+ and run_id = :run_id
+ and status = 'started'
+
+
+
+
+
+ select 1
+ from imsld_status_user
+ where related_id = :referenced_activity_id
+ and user_id = :user_id
+ and run_id = :run_id
+ and status = 'finished'
+
+
+
+
+
+ select acts.act_id,
+ plays.play_id
+ from imsld_actsi acts, imsld_playsi plays, imsld_role_parts rp
+ where rp.role_part_id = :role_part_id
+ and rp.act_id = acts.item_id
+ and acts.play_id = plays.item_id
+
+
+
+
+
+ select iri.role_id
+ from imsld_rolesi iri,
+ acs_rels ar,
+ imsld_support_activitiesi isai
+ where iri.item_id=ar.object_id_two
+ and ar.rel_type='imsld_sa_role_rel'
+ and ar.object_id_one=isai.item_id
+ and isai.activity_id =:activity_id
+
+
+
+
+
+ select
+ case
+ when exists (select 1 from imsld_learning_activities where activity_id=:activity_id)
+ then 'imsld_learning_activities'
+ when exists (select 1 from imsld_support_activities where activity_id=:activity_id)
+ then 'imsld_support_activities'
+ end as table_name
+ from dual
+
+
+
+
+
+ select ar2.object_id_two
+ from acs_rels ar1,
+ acs_rels ar2,
+ imsld_learning_activities tn
+ where tn.activity_id=:activity_id
+ and ar1.object_id_one=tn.prerequisite_id
+ and ar1.rel_type='imsld_preq_item_rel'
+ and ar1.object_id_two=ar2.object_id_one
+ and ar2.rel_type='imsld_item_res_rel'
+
+
+
+
+
+ select ar2.object_id_two
+ from acs_rels ar1,
+ acs_rels ar2,
+ imsld_learning_activities tn
+ where tn.activity_id=:activity_id
+ and ar1.object_id_one=tn.learning_objective_id
+ and ar1.rel_type='imsld_lo_item_rel'
+ and ar1.object_id_two=ar2.object_id_one
+ and ar2.rel_type='imsld_item_res_rel'
+
+
+
+
+
+ select ii.imsld_item_id
+ from imsld_items ii, imsld_activity_descs sad, imsld_support_activities sa,
+ cr_items cr1, cr_items cr2,
+ acs_rels ar
+ where sa.activity_id = :activity_id
+ and sa.activity_description_id = cr1.item_id
+ and cr1.live_revision = sad.description_id
+ and ar.object_id_one = sa.activity_description_id
+ and ar.object_id_two = cr2.item_id
+ and cr2.live_revision = ii.imsld_item_id
+
+
+
+
+
+ select cpr.resource_id,
+ cpr.item_id as resource_item_id,
+ cpr.type as resource_type
+ from imsld_cp_resourcesi cpr, imsld_itemsi ii,
+ acs_rels ar
+ where ar.object_id_one = ii.item_id
+ and ar.object_id_two = cpr.item_id
+ and content_revision__is_live(cpr.resource_id) = 't'
+ and ii.imsld_item_id = :imsld_item_id
+
+
+
+
Index: openacs-4/packages/imsld/www/imsld-tree.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/imsld-tree.adp,v
diff -u -N -r1.17 -r1.18
--- openacs-4/packages/imsld/www/imsld-tree.adp 8 Jul 2008 15:32:35 -0000 1.17
+++ openacs-4/packages/imsld/www/imsld-tree.adp 19 Feb 2009 13:07:26 -0000 1.18
@@ -2,7 +2,7 @@
1
@@ -22,7 +22,8 @@
- @html_tree;noquote@
+
@aux_html_tree;noquote@
Index: openacs-4/packages/imsld/www/imsld-tree.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/imsld-tree.tcl,v
diff -u -N -r1.19 -r1.20
--- openacs-4/packages/imsld/www/imsld-tree.tcl 17 Apr 2008 17:17:54 -0000 1.19
+++ openacs-4/packages/imsld/www/imsld-tree.tcl 19 Feb 2009 13:07:26 -0000 1.20
@@ -101,38 +101,12 @@
set user_message "[_ imsld.lt_The_course_has_been_f]"
}
-dom createDocument ul doc
-set dom_root [$doc documentElement]
-$dom_root setAttribute class "mktree"
-set imsld_title_node [$doc createElement li]
-$imsld_title_node setAttribute class "liOpen"
-set text [$doc createTextNode "$imsld_title"]
-$imsld_title_node appendChild $text
-$dom_root appendChild $imsld_title_node
-
-set activities_node [$doc createElement ul]
-
if { $user_role_id == -1 } {
- set html_tree ""
set aux_html_tree ""
} else {
- imsld::generate_activities_tree -run_id $run_id \
- -user_id $user_id \
- -next_activity_id_list $next_activity_id \
- -dom_node $activities_node \
- -dom_doc $doc
-
- $imsld_title_node appendChild $activities_node
-
- set html_tree [$dom_root asXML]
# runtime generated activities (notifications, level C)
- if { [db_string generated_acitivties_p {
- select count(*)
- from imsld_runtime_activities_rels
- where role_id = :current_role_id
- and run_id = :run_id
- } -default 0] > 0 } {
+ if { [db_string generated_activities_p { *SQL* } -default 0] > 0 } {
dom createDocument ul aux_doc
set aux_dom_root [$aux_doc documentElement]
$aux_dom_root setAttribute class "mktree"
Index: openacs-4/packages/imsld/www/imsld-tree.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/imsld-tree.xql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/imsld/www/imsld-tree.xql 19 Feb 2009 13:07:26 -0000 1.1
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ select count(*)
+ from imsld_runtime_activities_rels
+ where role_id = :current_role_id
+ and run_id = :run_id
+
+
+
+