Index: openacs-4/packages/imsld/tcl/imsld-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-procs.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/imsld/tcl/imsld-procs.tcl 13 Dec 2005 17:35:24 -0000 1.13
+++ openacs-4/packages/imsld/tcl/imsld-procs.tcl 14 Dec 2005 17:02:49 -0000 1.14
@@ -19,6 +19,13 @@
return $name
}
+ad_proc -public imsld::package_key {
+} {
+ returns the package_key of the IMS-LD package
+} {
+ return imsld
+}
+
ad_proc -public imsld::rel_type_delete {
-rel_type:required
} {
@@ -156,15 +163,15 @@
set user_id [ad_conn user_id]
# now that we have the necessary info, mark the finished element completed and return
db_dml insert_entry {
- insert into imsld_status_user
- values (
- :imsld_id,
- :role_part_id,
- :element_id,
- :user_id,
- :type,
- now()
- )
+ insert into imsld_status_user (
+ select :imsld_id,
+ :role_part_id,
+ :element_id,
+ :user_id,
+ :type,
+ now()
+ where not exists (select 1 from imsld_status_user where imsld_id = :imsld_id and user_id = :user_id and completed_id = :element_id and role_part_id = :role_part_id)
+ )
}
db_foreach referencer_structure {
@@ -823,7 +830,7 @@
set forum_title [db_exec_plsql get_froum_title {
select acs_object__name(:acs_object_id)
}]
- append files_lis " $forum_title "
+ append files_lis " "
}
imsqti_xmlv1p0 {
# assessment package call
@@ -836,7 +843,7 @@
where item_id = :acs_object_id
and content_revision__is_live(assessment_id) = 't'
}]
- append files_lis " $assessment_title "
+ append files_lis " "
}
webcontent -
default {
@@ -869,7 +876,7 @@
where fs.live_revision = :imsld_file_id
}]
set file_url "[apm_package_url_from_id $fs_package_id]view/${file_url}"
- append files_lis " $file_name "
+ append files_lis " "
}
# get associated urls
db_foreach associated_urls {
@@ -879,7 +886,7 @@
where ar.object_id_one = :resource_item_id
and ar.object_id_two = links.extlink_id
} {
- append files_lis " $url "
+ append files_lis " "
}
}
}
@@ -1135,18 +1142,14 @@
set prerequisites_list [imsld::process_prerequisite -imsld_item_id $imsld_item_id]
set prerequisites ""
if { [llength $prerequisites_list] } {
- set prerequisites "
[lindex $prerequisites_list 0]"
- append prerequisites "- [join [lindex $prerequisites_list 1] "
- "]"
- append prerequisites "
"
- regsub -all {[ ]*} $prerequisites "" prerequisites
+ set prerequisites "[lindex $prerequisites_list 0]
"
+ append prerequisites "[join [lindex $prerequisites_list 1] " "]"
}
set objectives_list [imsld::process_learning_objective -imsld_item_id $imsld_item_id]
set objectives ""
if { [llength $objectives_list] } {
- set objectives "[lindex $objectives_list 0]"
- append objectives "- [join [lindex $objectives_list 1] "
- "]"
- append objectives "
"
- regsub -all {[ ]*} $objectives "" objectives
+ set objectives "[lindex $objectives_list 0]
"
+ append objectives "[join [lindex $objectives_list 1] " "]"
}
if { [string length "${prerequisites}${objectives}"] } {
template::multirow append imsld_multirow $prerequisites $objectives {} {} {} {}
@@ -1211,39 +1214,31 @@
set activities_list [imsld::process_learning_activity -activity_item_id $activity_item_id]
set prerequisites ""
if { [llength [lindex $activities_list 0]] } {
- set prerequisites "[lindex [lindex $activities_list 0] 0]"
- append prerequisites "- [join [lindex [lindex $activities_list 0] 1] "
- "]"
- append prerequisites "
"
- regsub -all {[ ]*} $prerequisites "" prerequisites
+ set prerequisites "[lindex [lindex $activities_list 0] 0]
"
+ append prerequisites "[join [lindex [lindex $activities_list 0] 1] " "]"
}
set objectives ""
if { [llength [lindex $activities_list 1]] } {
- set objectives "[lindex [lindex $activities_list 1] 0]"
- append objectives "- [join [lindex [lindex $activities_list 1] 1] "
- "]"
- append objectives "
"
- regsub -all {[ ]*} $objectives "" objectives
+ set objectives "[lindex [lindex $activities_list 1] 0]
"
+ append objectives "[join [lindex [lindex $activities_list 1] 1] " "]"
}
if { [llength [lindex $activities_list 2]] } {
- set environments "[lindex [lindex $activities_list 2] 0]"
- append environments "- [join [lindex [lindex $activities_list 2] 1] "
- "]"
- append environments "
- [join [lindex [lindex $activities_list 2] 2] "
- "]"
- append environments "
- [join [lindex [lindex $activities_list 2] 3] "
- "]"
- append environments "
"
- regsub -all {[ ]*} $environments "" environments
+ set environments "[lindex [lindex $activities_list 2] 0]
"
+ append environments "[join [lindex [lindex $activities_list 2] 1] " "] "
+ append environments "[join [lindex [lindex $activities_list 2] 2] " "] "
+ append environments "[join [lindex [lindex $activities_list 2] 3] " "]"
# foreach nested_environment {
# append environments_files [expr { [llength [lindex [lindex $activities_list 2] 3]] ? [join [lindex [lindex $activities_list 2] 2] "
"] : "" }]
# }
}
- set activities "$activity_title
[join [lindex $activities_list 3] "
"]"
+ set activities "$activity_title
[join [lindex $activities_list 3] " "]"
set feedbacks ""
if { [llength [lindex $activities_list 4]] } {
- set feedbacks "[lindex [lindex $activities_list 4] 0]"
- append feedbacks "- [join [lindex [lindex $activities_list 4] 1] "
- "]"
- append feedbacks "
"
- regsub -all {[ ]*} $feedbacks "" feedbacks
+ set feedbacks "[lindex [lindex $activities_list 4] 0]
"
+ append feedbacks "[join [lindex [lindex $activities_list 4] 1] " "]"
}
template::multirow append imsld_multirow $prerequisites \
$objectives \
@@ -1262,22 +1257,18 @@
set activities_list [imsld::process_support_activity -activity_item_id $activity_item_id]
if { [llength [lindex $activities_list 0]] } {
- set environments "[lindex [lindex $activities_list 0] 0]"
- append environments "- [join [lindex [lindex $activities_list 0] 1] "
- "]"
- append environments "
- [join [lindex [lindex $activities_list 0] 2] "
- "]"
- append environments "
- [join [lindex [lindex $activities_list 0] 3] "
- "]"
- append environments "
"
- regsub -all {[ ]*} $environments "" environments
+ set environments "[lindex [lindex $activities_list 0] 0]
"
+ append environments "[join [lindex [lindex $activities_list 0] 1] " "] "
+ append environments "[join [lindex [lindex $activities_list 0] 2] " "] "
+ append environments "[join [lindex [lindex $activities_list 0] 3] " "] "
}
- set activities "$activity_title
[join [lindex $activities_list 1] "
"]"
+ set activities "$activity_title
[join [lindex $activities_list 1] " "]"
set feedbacks ""
if { [llength [lindex $activities_list 2]] } {
- set feedbacks "[lindex [lindex $activities_list 2] 0]"
- append feedbacks "- [join [lindex [lindex $activities_list 2] 1] "
- "]"
- append feedbacks "
"
- regsub -all {[ ]*} $feedbacks "" feedbacks
+ set feedbacks "[lindex [lindex $activities_list 2] 0]
"
+ append feedbacks "[join [lindex [lindex $activities_list 2] 1] " "]"
}
template::multirow append imsld_multirow {} \
{} \
@@ -1295,12 +1286,10 @@
}
set structure_list [imsld::process_activity_structure -structure_item_id $structure_item_id]
if { [llength [lindex $structure_list 0]] } {
- set environments "[lindex [lindex $structure_list 0] 0]"
- append environments "- [join [lindex [lindex $structure_list 0] 1] "
- "]"
- append environments "
- [join [lindex [lindex $structure_list 0] 2] "
- "]"
- append environments "
- [join [lindex [lindex $structure_list 0] 3] "
- "]"
- append environments "
"
- regsub -all {[ ]*} $environments "" environments
+ set environments "[lindex [lindex $structure_list 0] 0]
"
+ append environments "[join [lindex [lindex $structure_list 0] 1] " "] "
+ append environments "[join [lindex [lindex $structure_list 0] 2] " "] "
+ append environments "[join [lindex [lindex $structure_list 0] 3] " "]"
}
template::multirow append imsld_multirow {} {} $environments $activity_title {} finished
}
@@ -1424,12 +1413,10 @@
}
}
if { [llength $environment_list] } {
- set environments "[lindex $environment_list 0]"
- append environments "- [join [lindex $environment_list 1] "
- "]"
- append environments "
- [join [lindex $environment_list 2] "
- "]"
- append environments "
- [join [lindex $environment_list 3] "
- >"]"
- append environments "
"
- regsub -all {[ ]*} $environments "" environments
+ set environments "[lindex $environment_list 0]
"
+ append environments "[join [lindex $environment_list 1] " "] "
+ append environments "[join [lindex $environment_list 2] " "] "
+ append environments "[join [lindex $environment_list 3] " "]"
}
# learning activity
@@ -1446,28 +1433,22 @@
set activities_list [imsld::process_learning_activity -activity_item_id $activity_item_id]
set prerequisites ""
if { [llength [lindex $activities_list 0]] } {
- set prerequisites "[lindex [lindex $activities_list 0] 0]"
- append prerequisites "- [join [lindex [lindex $activities_list 0] 1] "
- "]"
- append prerequisites "
"
- regsub -all {[ ]*} $prerequisites "" prerequisites
+ set prerequisites "[lindex [lindex $activities_list 0] 0]
"
+ append prerequisites "[join [lindex [lindex $activities_list 0] 1] " "]"
}
set objectives ""
if { [llength [lindex $activities_list 1]] } {
- set objectives "[lindex [lindex $activities_list 1] 0]"
- append objectives "- [join [lindex [lindex $activities_list 1] 1] "
- "]"
- append objectives "
"
- regsub -all {[ ]*} $objectives "" objectives
+ set objectives "[lindex [lindex $activities_list 1] 0]
"
+ append objectives "[join [lindex [lindex $activities_list 1] 1] " "]"
}
if { [llength [lindex $activities_list 2]] } {
- set environments "[lindex [lindex $activities_list 2] 0]"
- append environments "- [join [lindex [lindex $activities_list 2] 1] "
- "]"
- append environments "
- [join [lindex [lindex $activities_list 2] 2] "
- "]"
- append environments "
- [join [lindex [lindex $activities_list 2] 3] "
- "]"
- append environments "
"
- regsub -all {[ ]*} $environments "" environments
+ set environments "[lindex [lindex $activities_list 2] 0]
"
+ append environments "[join [lindex [lindex $activities_list 2] 1] " "] "
+ append environments "[join [lindex [lindex $activities_list 2] 2] " "] "
+ append environments "[join [lindex [lindex $activities_list 2] 3] " "]"
}
set files ""
- set activities "$activity_title
[join [lindex $activities_list 3] "
"]"
+ set activities "$activity_title
[join [lindex $activities_list 3] " "]"
# if { [llength [lindex $activities_list 3]] } {
# set files "[join [lindex $activities_list 3] "
"]"
# regsub -all {[ ]*} $files "" files
@@ -1495,15 +1476,14 @@
set activities_list [imsld::process_support_activity -activity_item_id $activity_item_id]
if { [llength [lindex $activities_list 0]] } {
- set environments "[lindex [lindex $activities_list 0] 0]"
- append environments "- [join [lindex [lindex $activities_list 0] 1] "
- "]"
- append environments "
- [join [lindex [lindex $activities_list 0] 2] "
- "]"
- append environments "
- [join [lindex [lindex $activities_list 0] 3] "
- "]"
- append environments "
"
+ set environments "[lindex [lindex $activities_list 0] 0]
"
+ append environments "[join [lindex [lindex $activities_list 0] 1] " "] "
+ append environments "[join [lindex [lindex $activities_list 0] 2] " "] "
+ append environments "[join [lindex [lindex $activities_list 0] 3] " "]"
regsub -all {[ ]*} $environments "" environments
}
- set activities "$activity_title
[join [lindex $activities_list 1] "
"]"
+ set activities "$activity_title
[join [lindex $activities_list 1] " "]"
template::multirow append imsld_multirow {} \
{} \
Index: openacs-4/packages/imsld/www/resources/assessment.png
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/resources/assessment.png,v
diff -u
Binary files differ
Index: openacs-4/packages/imsld/www/resources/file-storage.png
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/resources/file-storage.png,v
diff -u
Binary files differ
Index: openacs-4/packages/imsld/www/resources/forums.png
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/resources/forums.png,v
diff -u
Binary files differ
Index: openacs-4/packages/imsld/www/resources/url.png
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/resources/url.png,v
diff -u
Binary files differ