Index: openacs-4/packages/imsld/imsld.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/imsld.info,v diff -u -r1.10 -r1.10.4.1 --- openacs-4/packages/imsld/imsld.info 25 Apr 2007 10:52:29 -0000 1.10 +++ openacs-4/packages/imsld/imsld.info 25 Jun 2007 17:46:53 -0000 1.10.4.1 @@ -7,14 +7,14 @@ f f - + Jose Pablo Escobedo Del Cid

IMS LD integration with dotLRN.

- 2006-10-20 + 2007-06-25 This package is the implementation of IMS LD in dotLRN. The course admin can create a sequence of activities for the students, as well as decide who does what, when and using what resources. 0 - + Index: openacs-4/packages/imsld/lib/imsld-master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/lib/imsld-master.adp,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/imsld/lib/imsld-master.adp 14 Jun 2007 14:31:29 -0000 1.1.2.1 +++ openacs-4/packages/imsld/lib/imsld-master.adp 25 Jun 2007 17:46:53 -0000 1.1.2.2 @@ -16,6 +16,15 @@ + +

@user_messages.message;noquote@

+ - - -

+ +

- -

+ +

@@ -44,14 +27,15 @@ @activities;noquote@ +

#imsld.navigate#

- - - - - - - #imsld.Monitoring#: @monitoring_user_name@ @@ -46,8 +27,6 @@ - - - Index: openacs-4/packages/imsld/www/properties-value-set.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/properties-value-set.tcl,v diff -u -r1.4 -r1.4.4.1 --- openacs-4/packages/imsld/www/properties-value-set.tcl 25 Apr 2007 10:52:30 -0000 1.4 +++ openacs-4/packages/imsld/www/properties-value-set.tcl 25 Jun 2007 17:46:54 -0000 1.4.4.1 @@ -6,6 +6,8 @@ instances_ids:array return_url owner_id + run_id + {role_instance_id ""} } -validate { no_instance { if { [array size instances_ids] == 0 } { @@ -19,7 +21,6 @@ # avoiding hacks db_1row instance_info_id { select ins.property_id, - ins.run_id, prop.datatype from imsld_property_instances ins, imsld_properties prop @@ -30,13 +31,15 @@ if { [string eq "file" $datatype] } { imsld::runtime::property::property_value_set -run_id $run_id \ -user_id $owner_id \ + -role_instance_id $role_instance_id \ -value $instances_ids($instance_id) \ -property_id $property_id \ -upload_file $instances_ids($instance_id) \ -tmpfile $instances_ids(${instance_id}.tmpfile) } else { imsld::runtime::property::property_value_set -run_id $run_id \ -user_id $owner_id \ + -role_instance_id $role_instance_id \ -value $instances_ids($instance_id) \ -property_id $property_id } Index: openacs-4/packages/imsld/www/admin/imsld-confirm-finish.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/imsld-confirm-finish.tcl,v diff -u -r1.8 -r1.8.4.1 --- openacs-4/packages/imsld/www/admin/imsld-confirm-finish.tcl 21 Dec 2006 15:20:47 -0000 1.8 +++ openacs-4/packages/imsld/www/admin/imsld-confirm-finish.tcl 25 Jun 2007 17:46:54 -0000 1.8.4.1 @@ -9,9 +9,6 @@ } -# instantiating properties and activity attributes for the run -imsld::instance::instantiate_properties -run_id $run_id -imsld::instance::instantiate_activity_attributes -run_id $run_id # NOTE: we should verify the permissions here set conditions 1 if {$conditions == 1} { @@ -28,8 +25,24 @@ foreach role_id [imsld::roles::get_list_of_roles -imsld_id $imsld_id] { set users_list [concat $users_list [imsld::roles::get_users_in_role -role_id [lindex $role_id 0] -run_id $run_id]] } - + +set group_run_id [db_string get_run_group_id { + select group_id + from imsld_run_users_group_ext + where run_id = :run_id +}] + +# add the users to the run_group foreach user_id $users_list { + relation_add imsld_run_users_group_rel $group_run_id $user_id +} + +# instantiating properties and activity attributes for the run +imsld::instance::instantiate_properties -run_id $run_id +imsld::instance::instantiate_activity_attributes -run_id $run_id + +# execute the conditions +foreach user_id $users_list { imsld::condition::execute_all -run_id $run_id -user_id $user_id } Index: openacs-4/packages/imsld/www/admin/imsld-new-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/imsld-new-2.tcl,v diff -u -r1.9.4.1 -r1.9.4.2 --- openacs-4/packages/imsld/www/admin/imsld-new-2.tcl 31 May 2007 09:12:28 -0000 1.9.4.1 +++ openacs-4/packages/imsld/www/admin/imsld-new-2.tcl 25 Jun 2007 17:46:54 -0000 1.9.4.2 @@ -66,6 +66,6 @@ } # go to the roles admin page... -ad_progress_bar_end -url [export_vars -base imsld-admin-roles {run_id}] +ad_progress_bar_end -url "index" Index: openacs-4/packages/imsld/www/admin/imsld-role-members.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/imsld-role-members.xql,v diff -u -r1.5 -r1.5.4.1 --- openacs-4/packages/imsld/www/admin/imsld-role-members.xql 10 Jul 2006 13:45:29 -0000 1.5 +++ openacs-4/packages/imsld/www/admin/imsld-role-members.xql 25 Jun 2007 17:46:54 -0000 1.5.4.1 @@ -23,13 +23,11 @@ select aua.user_id from acs_users_all aua, - acs_rels ar, - imsld_run_users_group_ext r_map + acs_rels ar where aua.user_id > 0 and aua.user_id not in ([join $members_list ","]) and aua.user_id=ar.object_id_two - and ar.object_id_one = r_map.group_id - and r_map.run_id = :run_id + and ar.object_id_one = :community_id Index: openacs-4/packages/imsld/www/admin/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/index.adp,v diff -u -r1.2.4.2 -r1.2.4.3 --- openacs-4/packages/imsld/www/admin/index.adp 14 Jun 2007 14:31:29 -0000 1.2.4.2 +++ openacs-4/packages/imsld/www/admin/index.adp 25 Jun 2007 17:46:54 -0000 1.2.4.3 @@ -1,15 +1,12 @@ @page_title;noquote@ @context;noquote@ - - -

#imsld.IMS-LDs_1#

#imsld.Runs#

+ Index: openacs-4/packages/imsld/www/admin/monitor/properties-frame.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/monitor/properties-frame.tcl,v diff -u -r1.1 -r1.1.4.1 --- openacs-4/packages/imsld/www/admin/monitor/properties-frame.tcl 25 Apr 2007 10:52:31 -0000 1.1 +++ openacs-4/packages/imsld/www/admin/monitor/properties-frame.tcl 25 Jun 2007 17:46:55 -0000 1.1.4.1 @@ -20,19 +20,6 @@ } } -# context info -db_1row context_info { - select ic.item_id as component_item_id, - ii.imsld_id, - rug.group_id as run_group_id - from imsld_componentsi ic, imsld_imsldsi ii, imsld_runs ir, imsld_run_users_group_ext rug - where ic.imsld_id = ii.item_id - and content_revision__is_live(ii.imsld_id) = 't' - and ii.imsld_id = ir.imsld_id - and rug.run_id = ir.run_id - and ir.run_id = :run_id -} - # Get file-storage root folder_id set fs_package_id [site_node_apm_integration::get_child_package_id \ -package_id [dotlrn_community::get_package_id [dotlrn_community::get_community_id]] \ @@ -98,18 +85,18 @@ $form_node appendChild $select_node # adding hidden variables - set run_id_node [$dom_doc createElement "input"] - $run_id_node setAttribute name "run_id" - $run_id_node setAttribute type "hidden" - $run_id_node setAttribute value "$run_id" - $form_node appendChild $run_id_node - set type_node [$dom_doc createElement "input"] $type_node setAttribute name "type" $type_node setAttribute type "hidden" $type_node setAttribute value "$type" $form_node appendChild $type_node + set run_id_node [$dom_doc createElement "input"] + $run_id_node setAttribute name "run_id" + $run_id_node setAttribute type "hidden" + $run_id_node setAttribute value "$run_id" + $form_node appendChild $run_id_node + # adding the submit button set submit_node [$dom_doc createElement "input"] $submit_node setAttribute type "submit" @@ -153,19 +140,19 @@ } $form_node appendChild $select_node - # adding hidden variables - set run_id_node [$dom_doc createElement "input"] - $run_id_node setAttribute name "run_id" - $run_id_node setAttribute type "hidden" - $run_id_node setAttribute value "$run_id" - $form_node appendChild $run_id_node - + #adding hidden variables set type_node [$dom_doc createElement "input"] $type_node setAttribute name "type" $type_node setAttribute type "hidden" $type_node setAttribute value "$type" $form_node appendChild $type_node + set run_id_node [$dom_doc createElement "input"] + $run_id_node setAttribute name "run_id" + $run_id_node setAttribute type "hidden" + $run_id_node setAttribute value "$run_id" + $form_node appendChild $run_id_node + set role_id_node [$dom_doc createElement "input"] $role_id_node setAttribute name "role_id" $role_id_node setAttribute type "hidden" @@ -334,6 +321,21 @@ $owner_node setAttribute value "$user_id" $form_node appendChild $owner_node + if { ![string eq "" $role_instance_id] } { + set role_instance_node [$dom_doc createElement "input"] + $role_instance_node setAttribute name "role_instance_id" + $role_instance_node setAttribute type "hidden" + $role_instance_node setAttribute value "$role_instance_id" + $form_node appendChild $role_instance_node + } + + # adding hidden variables + set run_id_node [$dom_doc createElement "input"] + $run_id_node setAttribute name "run_id" + $run_id_node setAttribute type "hidden" + $run_id_node setAttribute value "$run_id" + $form_node appendChild $run_id_node + # adding return url set return_url_node [$dom_doc createElement "input"] $return_url_node setAttribute name "return_url" Index: openacs-4/packages/imsld/www/resources/imsld.css =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/resources/imsld.css,v diff -u -r1.1.2.3 -r1.1.2.4 --- openacs-4/packages/imsld/www/resources/imsld.css 14 Jun 2007 14:31:30 -0000 1.1.2.3 +++ openacs-4/packages/imsld/www/resources/imsld.css 25 Jun 2007 17:46:55 -0000 1.1.2.4 @@ -74,3 +74,27 @@ white-space: nowrap; } +/* arrow to minimize / maximize the activitie's tree window */ + + +/* notices / messages style */ +.notice { + font-size: x-small; + font-weight: bold; + background-color: #bbbbff; + padding:0px; + margin:0px; +} + +.hide { + position:absolute; + top:0px; + left:0px; + display:none; +} +.show { + position:relative; + top:0px; + left:0px; +} + Index: openacs-4/packages/imsld/www/resources/imsld.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/resources/imsld.js,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/imsld/www/resources/imsld.js 14 Jun 2007 14:31:30 -0000 1.1.2.1 +++ openacs-4/packages/imsld/www/resources/imsld.js 25 Jun 2007 17:46:55 -0000 1.1.2.2 @@ -46,17 +46,17 @@ var ac=document.getElementById("addc1"); if (a) { - ai=''; - aj='none'; + ai='show'; + aj='hide'; parent.document.getElementsByTagName("frameset")[0].cols='30%,*'; } else { - ai='none'; - aj=''; + ai='hide'; + aj='show'; parent.document.getElementsByTagName("frameset")[0].cols='0%,*'; } - ac.style.display=ai; - ab.style.display=aj; + ac.className=ai; + ab.className=aj; return false; } @@ -80,5 +80,4 @@ } tabberAutomatic(); - }