Index: openacs-4/packages/imsld/www/imsld-finish-resource.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/imsld-finish-resource.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/imsld/www/imsld-finish-resource.tcl 30 Jan 2006 12:00:46 -0000 1.2
+++ openacs-4/packages/imsld/www/imsld-finish-resource.tcl 2 Feb 2006 13:57:15 -0000 1.3
@@ -21,32 +21,36 @@
where ifre.rel_id=ar1.rel_id and
ar1.object_id_two=ar2.object_id_one and
ar2.object_id_two=:resource_item_id
- } ] } {
+ } ] } {
- set prerequisites_list [db_list get_all_prerequisites {
- select prerequisite_id
- from imsld_imslds
- }]
- set objectives_list [db_list get_all_objectives {
- select learning_objective_id
- from imsld_imslds
- }]
+#assessment is finished by a callback when results are submited
+ if {![db_string is_assessment {} ]} {
+ set prerequisites_list [db_list get_all_prerequisites {
+ select prerequisite_id
+ from imsld_imslds
+ }]
+ set objectives_list [db_list get_all_objectives {
+ select learning_objective_id
+ from imsld_imslds
+ }]
+
#para no finalizar los prerequisitos y objetivos globales
- set identifier ""
- db_0or1row get_identifier_resource_id {
- select ar1.object_id_one as identifier
- from acs_rels ar1,
- acs_rels ar2
- where ar1.object_id_two=ar2.object_id_one
- and ar2.object_id_two=:resource_item_id;
- }
+ set identifier ""
+ db_0or1row get_identifier_resource_id {
+ select ar1.object_id_one as identifier
+ from acs_rels ar1,
+ acs_rels ar2
+ where ar1.object_id_two=ar2.object_id_one
+ and ar2.object_id_two=:resource_item_id;
+ }
- if { [lsearch [concat $prerequisites_list $objectives_list] $identifier] != "-1" } {
+ if { [lsearch [concat $prerequisites_list $objectives_list] $identifier] != "-1" } {
- } else {
+ } else {
- imsld::finish_resource -resource_id $resource_id
- }
+ imsld::finish_resource -resource_id $resource_id
+ }
+ }
}
ad_returnredirect $file_url
Index: openacs-4/packages/imsld/www/imsld-finish-resource.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/imsld-finish-resource.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/imsld/www/imsld-finish-resource.xql 1 Feb 2006 11:38:22 -0000 1.1
+++ openacs-4/packages/imsld/www/imsld-finish-resource.xql 2 Feb 2006 13:57:15 -0000 1.2
@@ -43,6 +43,14 @@
+
+
+ select count(*)
+ from imsld_cp_resources
+ where resource_id=:resource_id and
+ type='imsqti_xmlv1p0'
+
+