Index: openacs-4/packages/imsld/catalog/imsld.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/catalog/imsld.en_US.ISO-8859-1.xml,v
diff -u -r1.32 -r1.33
--- openacs-4/packages/imsld/catalog/imsld.en_US.ISO-8859-1.xml	3 Nov 2006 14:39:02 -0000	1.32
+++ openacs-4/packages/imsld/catalog/imsld.en_US.ISO-8859-1.xml	21 Dec 2006 15:20:47 -0000	1.33
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <message_catalog package_key="imsld" package_version="1.0d" locale="en_US" charset="ISO-8859-1">
 
+  <msg key="_Assigned_users">| Assigned users:</msg>
   <msg key="_Component">Component Identifier</msg>
+  <msg key="_Creation_Date">| Creation Date:</msg>
+  <msg key="_Status_The_run_is">| Status: The run is</msg>
   <msg key="Act_Identifier">Act Identifier</msg>
   <msg key="active">active</msg>
   <msg key="Activity_Identifier">Activity Identifier</msg>
+  <msg key="Activity_Name">Activity Name</msg>
   <msg key="Activity_Structures">Activity Structures</msg>
+  <msg key="Activity_Type">Activity Type</msg>
   <msg key="Acts_in_play_count">Acts in play %count%</msg>
   <msg key="Admin_IMS_LD">Admin IMS LD</msg>
   <msg key="Back">Back to admin</msg>
@@ -18,7 +23,9 @@
   <msg key="Complete_Acts">Complete Acts</msg>
   <msg key="Component_Identifier">Component Identifier</msg>
   <msg key="Condition">Condition</msg>
+  <msg key="conference">conference</msg>
   <msg key="Conference_Type">Conference Type</msg>
+  <msg key="Confirm">Confirm</msg>
   <msg key="Confirm_New_IMS-LD">Confirm: New IMS-LD</msg>
   <msg key="Context_info">Context info</msg>
   <msg key="Create_New">Create New?</msg>
@@ -33,14 +40,21 @@
   <msg key="Descendant">Descendant roles:</msg>
   <msg key="Description">Description</msg>
   <msg key="Else_Identifier">Else Identifier</msg>
+  <msg key="Email">Email</msg>
   <msg key="Error_parsing_file">Error parsing file</msg>
   <msg key="Existing_href">Existing href</msg>
+  <msg key="Exit">Exit UoL</msg>
   <msg key="Expression">Expression</msg>
   <msg key="Extra_Activities">Extra Activities</msg>
   <msg key="Feedbach_Title">Feedbach Title</msg>
   <msg key="Feedback">Feedback</msg>
   <msg key="File_name">File name</msg>
+  <msg key="Finish_Date">Finish Date</msg>
   <msg key="finished">finished</msg>
+  <msg key="Finished_Date">Finished Date</msg>
+  <msg key="Go_back">Go back</msg>
+  <msg key="go_back">go back</msg>
+  <msg key="Group_members">Group members</msg>
   <msg key="Groups">Groups in role</msg>
   <msg key="Href">Href</msg>
   <msg key="Identifier">Identifier</msg>
@@ -101,6 +115,7 @@
   <msg key="IMS-LDs">IMS-LDs</msg>
   <msg key="IMS-LDs_1">IMS Learning Designs</msg>
   <msg key="IMS_LD_Name">Unit of Learning Name</msg>
+  <msg key="Individual_Report">Individual Report</msg>
   <msg key="Information">Information</msg>
   <msg key="Initial_Value">Initial Value</msg>
   <msg key="Is_shared">Is shared?</msg>
@@ -117,6 +132,7 @@
   <msg key="li_impozzible_li">&lt;li&gt; impozzible &lt;/li&gt;</msg>
   <msg key="lt_Activity_Description_">Activity Description Identifier</msg>
   <msg key="lt_Activity_Structure_Id">Activity Structure Identifier</msg>
+  <msg key="lt_Are_all_the_students_">Are all the students asigned to the proper roles? If you confirm now, no more changes will be acepted later.</msg>
   <msg key="lt_br___________________">&lt;br&gt;\ 
                               Go to the activity &lt;a href=\&quot;%activity_url%\&quot;&gt;%activity_title%&lt;/a&gt; (of the UoL &lt;a href=\&quot;%imsld_url%\&quot;&gt;%imsld_title%&lt;/a&gt; in the community &lt;a href=\&quot;$community_url\&quot;&gt;%community_name%&lt;/a&gt;) for further details.</msg>
   <msg key="lt_br____________________1">&lt;br&gt;\
@@ -141,6 +157,7 @@
   <msg key="lt_Expression_One_Identi">Expression One Identifier</msg>
   <msg key="lt_Expression_Two_Identi">Expression Two Identifer</msg>
   <msg key="lt_h2Uploading_new_IMS_L">&lt;h2&gt;Uploading new IMS Learning Design&lt;/h2&gt;</msg>
+  <msg key="lt_If_you_are_not_sure_t">If you are not sure that everything is OK, please</msg>
   <msg key="lt_Import_IMS-LD_ZIP_Fil">Import IMS-LD ZIP File</msg>
   <msg key="lt_IMS-LD_Activity_Descr">IMS-LD Activity Description</msg>
   <msg key="lt_IMS-LD_Activity_Descr_1">IMS-LD Activity Descriptions</msg>
@@ -182,6 +199,9 @@
   <msg key="lt_Learning_Unit_finishe">Learning Unit finished</msg>
   <msg key="lt_li_desc_no_file_assoc">&lt;li&gt; desc (no file associated) &lt;/li&gt;</msg>
   <msg key="lt_manifest_namespace_is">manifest namespace is not imscp</msg>
+  <msg key="lt_Max_number_of_student">Max. number of students per group: %max_persons%</msg>
+  <msg key="lt_Min_number_of_student">Min. number of students per group: %min_persons%</msg>
+  <msg key="lt_Monitoring_One_Activi">Monitoring One Activity</msg>
   <msg key="lt_More_than_one_service">More than one service in environment %identifier%. Just one used (the first one)</msg>
   <msg key="lt_More_than_one_validat">More than one validation tried at the same time</msg>
   <msg key="lt_No_imsmanifestxml_fou">No imsmanifest.xml found</msg>
@@ -193,6 +213,7 @@
   <msg key="lt_On_Completion_Identif">On Completion Identifier</msg>
   <msg key="lt_Organization_Identifi">Organization Identifier</msg>
   <msg key="lt_organizations_tag_not">organizations tag not found in imsmanifest.xml</msg>
+  <msg key="lt_Otherwise_if_everthin">Otherwise, if everthing is OK and you are sure, please</msg>
   <msg key="lt_Parent_Item_Identifie">Parent Item Identifier</msg>
   <msg key="lt_Parent_Manifest_Ident">Parent Manifest Identifier</msg>
   <msg key="lt_Parent_Role_Identifie">Parent Role Identifier</msg>
@@ -222,7 +243,13 @@
   <msg key="lt_Referenced_support_ac_4">Referenced support activity (%support_activity_ref_ref%) in role part %identifie% does not exist.</msg>
   <msg key="lt_Referenced_support_ac_5">Referenced support activity %support_activity_ref_ref% in role part %identifier% is actually an activity structure.</msg>
   <msg key="lt_Referenced_support_ac_6">Referenced support activity %support_activity_ref% in role part %identifier% is actually a learning activity.</msg>
+  <msg key="lt_Select_a_role_to_send">Select a role to send the email</msg>
+  <msg key="lt_Select_parent_for_the">Select parent for the new instance</msg>
+  <msg key="lt_Select_role_to_suppor">Select role to support...</msg>
+  <msg key="lt_Select_user_to_suppor">Select user to support...</msg>
   <msg key="lt_Service_type_service_">Service type %service_type% not implemented</msg>
+  <msg key="lt_Some_errors_has_been_">Some errors has been found</msg>
+  <msg key="lt_Some_warnings_has_bee">Some warnings has been found</msg>
   <msg key="lt_Sorry_that_service_ty">Sorry, that service type (%service_type%) hasn't been implemented yet.</msg>
   <msg key="lt_Support_Activity_Iden">Support Activity Identifier</msg>
   <msg key="lt_The_decimal_digits_ca">The decimal digits can't be more than %restriction_value%</msg>
@@ -266,6 +293,7 @@
   <msg key="lt_There_was_an_error_ge">There was an error generating the tmp_dir to unzip the file.</msg>
   <msg key="lt_There_was_an_error_pa">There was an error parsing the manifest. Please correct it and try again. &lt;br /&gt;&lt;code&gt;%errmsg%&lt;/code&gt;</msg>
   <msg key="lt_There_was_an_error_tr">There was an error trying to delete the dir %dir%.</msg>
+  <msg key="lt_This_is_a_special_cas">This is a special case and we can only list the users who have sent an email since the run became active and that are associated with the run.</msg>
   <msg key="lt_Time_Limit_Identifier">Time Limit Identifier</msg>
   <msg key="lt_Time_Property_Identif">Time Property Identifier</msg>
   <msg key="lt_ul_Completed_Activiti">&lt;ul&gt; Completed Activities &lt;br /&gt;</msg>
@@ -275,12 +303,16 @@
                        %sender_name% has triggered this notification. Please do not replay to this email. &lt;br&gt;&lt;br&gt; 
                        Go to the UoL: &lt;a href=\&quot;%imsld_url%\&quot;&gt;%imsld_title%&lt;/a&gt; (in the community: &lt;a href=\&quot;%community_url%\&quot;&gt;%community_name%&lt;/a&gt; community) for further details.</msg>
   <msg key="lt_Username_Property_Ide">Username Property Identifier</msg>
+  <msg key="lt_Users_who_have_bat_le">Users who have &lt;b&gt;at least visited&lt;/b&gt; the service</msg>
+  <msg key="lt_Users_who_have_bviewe">Users who have &lt;b&gt;viewed/visited all&lt;/b&gt; the referenced resources from the environment</msg>
+  <msg key="lt_Users_who_have_starte">Users who have started and/or finished this activity</msg>
   <msg key="lt_Valid_types_are_learn">Valid types are learning, support and structure</msg>
   <msg key="lt_Warning_More_than_one">More than one learning object in environment %identifier%. Just one used (the first one)</msg>
   <msg key="lt_We_will_continue_auto">We will continue automatically when processing is complete.</msg>
   <msg key="lt_When_Last_Act_Complet">When Last Act Completed?</msg>
   <msg key="lt_When_Property_Value_i">When Property Value is Set Identifier</msg>
   <msg key="lt_When_property_value_i">When property value is set XML</msg>
+  <msg key="lt_You_must_provide_an_a">You must provide an activity_id, service_id or learning_object_id...</msg>
   <msg key="Mail_Data">Mail Data</msg>
   <msg key="Make_it_live">(make it live)</msg>
   <msg key="Manage_Members">Manage Members</msg>
@@ -292,14 +324,19 @@
   <msg key="Method_Identifier">Method Identifier</msg>
   <msg key="Min_Persons">Min Persons</msg>
   <msg key="Moderator_Identifier">Moderator_Identifier</msg>
+  <msg key="Monitor">Monitor</msg>
+  <msg key="monitor">monitor</msg>
   <msg key="Monitoring">User</msg>
+  <msg key="Name">Name</msg>
   <msg key="nbspnbspnbspdone">&amp;nbsp;&amp;nbsp;&amp;nbsp;done</msg>
   <msg key="New_IMS-LD">New IMS-LD</msg>
   <msg key="No">information found in the imsmanifest.xml file. Nothing to do.</msg>
   <msg key="No_IMS_LD">No IMS LD</msg>
+  <msg key="No_info_was_found">No info was found</msg>
   <msg key="None">None</msg>
   <msg key="None_please_select">None, please select</msg>
   <msg key="Not_defined">Not defined</msg>
+  <msg key="Not_members">Not members</msg>
   <msg key="Notification">Notification</msg>
   <msg key="Notification_Subject">Notification Subject</msg>
   <msg key="Notifications">Notifications</msg>
@@ -328,20 +365,25 @@
   <msg key="Role_Type">Role Type</msg>
   <msg key="Roles_in_Run">Role(s) in Run</msg>
   <msg key="Run_IMS-LD_Name">Run (IMS-LD) Name</msg>
+  <msg key="Runinfo_Name">Run(UoL) Name:</msg>
   <msg key="Runs">Runs (IMS-LD instances)</msg>
   <msg key="Select">select user...</msg>
   <msg key="Select_a_role">Select a role...</msg>
   <msg key="Select_a_role_1">Select a role</msg>
   <msg key="Select_role">Select role...</msg>
   <msg key="Self">Self</msg>
   <msg key="send-mail_service">send-mail service</msg>
+  <msg key="sendmail">sendmail</msg>
   <msg key="Sendmail_Identifier">Sendmail Identifier</msg>
   <msg key="Sequence_Used">Sequence Used</msg>
   <msg key="Service_Identifier">Service Identifier</msg>
   <msg key="Service_Type">Service Type</msg>
+  <msg key="since">since</msg>
   <msg key="Sort">Sort</msg>
   <msg key="Sort_Order">Sort Order</msg>
   <msg key="Staff_Roles">Staff Roles</msg>
+  <msg key="Start_Date">Start Date</msg>
+  <msg key="Started_Date">Started Date</msg>
   <msg key="Status">Status</msg>
   <msg key="stopped">stopped</msg>
   <msg key="Structure_Type">Structure Type</msg>
@@ -350,6 +392,7 @@
   <msg key="The">The selected role has no parent</msg>
   <msg key="Then_Identifier">Then Identifier</msg>
   <msg key="There">There are no descendant roles</msg>
+  <msg key="This">is the list of activities started (and finished) by %member_name%</msg>
   <msg key="Time_in_Seconds">Time in Seconds</msg>
   <msg key="Total_Activities">Total Activities</msg>
   <msg key="Total_Roles">Parent Roles</msg>
Index: openacs-4/packages/imsld/sql/postgresql/imsld-level-c-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/sql/postgresql/imsld-level-c-create.sql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/imsld/sql/postgresql/imsld-level-c-create.sql	24 Oct 2006 10:09:50 -0000	1.1
+++ openacs-4/packages/imsld/sql/postgresql/imsld-level-c-create.sql	21 Dec 2006 15:20:47 -0000	1.2
@@ -44,3 +44,24 @@
 comment on table imsld_notifications_history is '
 Table used to keep track of the notifications';
 
+create sequence t_imsld_rar_seq;
+create view imsld_rar_seq as
+select nextval('t_imsld_rar_seq') as nextval;
+
+create table imsld_runtime_activities_rels (
+    rel_id      integer
+                constraint imsld_rar_rels_pk
+                primary key,
+    run_id      integer
+                constraint imsld_rar_run_fk
+                references imsld_runs,
+    role_id     integer
+                constraint imsld_rar_role_fk
+                references cr_revisions,
+    activity_id integer
+                constraint imsld_rar_act_fk
+                references cr_revisions
+);
+
+comment on table imsld_runtime_activities_rels is '
+This table stores the relationships between run time assigned activities and roles.';
Index: openacs-4/packages/imsld/sql/postgresql/imsld-level-c-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/sql/postgresql/imsld-level-c-drop.sql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/imsld/sql/postgresql/imsld-level-c-drop.sql	24 Oct 2006 10:09:50 -0000	1.1
+++ openacs-4/packages/imsld/sql/postgresql/imsld-level-c-drop.sql	21 Dec 2006 15:20:47 -0000	1.2
@@ -8,3 +8,7 @@
 drop table imsld_notifications cascade;
 
 drop table imsld_notifications_history cascade;
+
+drop table imsld_runtime_activities_rels cascade;
+
+drop sequence imsld_rar_seq;
Index: openacs-4/packages/imsld/sql/postgresql/upgrade/upgrade-0.01d-1.0d.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/sql/postgresql/upgrade/Attic/upgrade-0.01d-1.0d.sql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/imsld/sql/postgresql/upgrade/upgrade-0.01d-1.0d.sql	3 Nov 2006 14:40:39 -0000	1.1
+++ openacs-4/packages/imsld/sql/postgresql/upgrade/upgrade-0.01d-1.0d.sql	21 Dec 2006 15:20:47 -0000	1.2
@@ -1,34 +1,56 @@
+-- upgrade script from 0.01d to 1.0d
 
+create function inline_0 ()
+returns integer as'
+declare
+  sel_rec record;
+begin
+  for sel_rec in select serv.username_property_id, serv.email_property_id, data.data_id 
+    from imsld_send_mail_data data, imsld_send_mail_servicesi serv 
+	where data.send_mail_id = serv.item_id
+    and content_revision__is_live(serv.mail_id) = ''t''
+  loop 
+    update imsld_send_mail_data 
+    set email_property_id = sel_rec.email_property_id,
+    username_property_id = sel_rec.username_property_id
+    where data_id = sel_rec.data_id;
+  end loop;
+return 0;
+end;' language 'plpgsql';
+select inline_0 ();
+drop function inline_0 ();
 
---create function inline_0 ()
---returns integer as'
---declare
---  sel_rec record;
---begin
---  for sel_rec in select serv.username_property_id, serv.email_property_id, data.data_id 
---    from imsld_send_mail_data data, imsld_send_mail_servicesi serv 
---	where data.send_mail_id = serv.item_id
---    and content_revision__is_live(serv.mail_id) = ''t''
---  loop 
---    update imsld_send_mail_data 
---    set email_property_id = sel_rec.email_property_id,
---    username_property_id = sel_rec.username_property_id
---    where data_id = sel_rec.data_id;
---  end loop;
---return 0;
---end;' language 'plpgsql';
---select inline_0 ();
---drop function inline_0 ();
 
+drop index imsld_sm_data_sm_id_idx;
+alter table imsld_send_mail_data drop column send_mail_id cascade;
+select content_type__drop_attribute('imsld_send_mail_data','send_mail_id','f');
 
---drop index imsld_sm_data_sm_id_idx;
---alter table imsld_send_mail_data drop column send_mail_id cascade;
---select content_type__drop_attribute('imsld_send_mail_data','send_mail_id','f');
+alter table imsld_send_mail_services drop column email_property_id cascade;
+select content_type__drop_attribute('imsld_send_mail_service','email_property_id','f');
 
---alter table imsld_send_mail_services drop column email_property_id cascade;
---select content_type__drop_attribute('imsld_send_mail_service','email_property_id','f');
+alter table imsld_send_mail_services drop column username_property_id cascade;
+select content_type__drop_attribute('imsld_send_mail_service','username_property_id','f');
 
---alter table imsld_send_mail_services drop column username_property_id cascade;
---select content_type__drop_attribute('imsld_send_mail_service','username_property_id','f');
+create sequence t_imsld_rar_seq;
+create view imsld_rar_seq as
+select nextval('t_imsld_rar_seq') as nextval;
 
+create table imsld_runtime_activities_rels (
+    rel_id      integer
+                constraint imsld_rar_rels_pk
+                primary key,
+    run_id      integer
+                constraint imsld_rar_run_fk
+                references imsld_runs,
+    role_id     integer
+                constraint imsld_rar_role_fk
+                references cr_revisions,
+    activity_id integer
+                constraint imsld_rar_act_fk
+                references cr_revisions
+);
+
+comment on table imsld_runtime_activities_rels is '
+This table stores the relationships between run time assigned activities and roles.';
+
 \i ../imsld-level-c-create.sql
Index: openacs-4/packages/imsld/tcl/imsld-install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-install-procs.tcl,v
diff -u -r1.40 -r1.41
--- openacs-4/packages/imsld/tcl/imsld-install-procs.tcl	19 Dec 2006 10:36:07 -0000	1.40
+++ openacs-4/packages/imsld/tcl/imsld-install-procs.tcl	21 Dec 2006 15:20:47 -0000	1.41
@@ -552,14 +552,6 @@
     rel_types::new imsld_send_mail_serv_data_rel "Send Mail Service - Email Data" "Send Mail Service - Email Datas" \
         content_item 0 {} \
         content_item 0 {}
-
-    # Level C, notifications: Runtime assigned activities
-    # Notifications may set to TRUE the visibility attribute of ANY activity for a given role, 
-    # and by any we mean that the activity does not have to be assigned to a role part associated with that role. 
-    # Therefore we crate this rel type where we map the role with the runtime assigned activities 
-    rel_types::new imsld_run_time_activities_rel "Role - Activity" "Role - Activities" \
-        content_revision 0 {} \
-        content_revision 0 {}
 }
 
 ad_proc -public imsld::install::after_upgrade {
@@ -590,16 +582,7 @@
                     content_item 0 {} \
                     content_item 0 {}
                 
-                # Level C, notifications: Runtime assigned activities
-                # Notifications may set to TRUE the visibility attribute of ANY activity for a given role, 
-                # and by any we mean that the activity does not have to be assigned to a role part associated with that role. 
-                # Therefore we crate this rel type where we map the role with the runtime assigned activities 
-                rel_types::new imsld_run_time_activities_rel "Role - Activity" "Role - Activities" \
-                    content_revision 0 {} \
-                    content_revision 0 {}
-                
                 # special case: add the new attributes, new rel and migrate the existing data
-
                 content::type::attribute::new -content_type imsld_send_mail_data -attribute_name email_property_id -datatype number -pretty_name "#imsld.lt_Email_Propery_Identif#" -column_spec "integer"
                 content::type::attribute::new -content_type imsld_send_mail_data -attribute_name username_property_id -datatype number -pretty_name "#imsld.lt_Username_Property_Ide#" -column_spec "integer"
 
@@ -684,7 +667,6 @@
     imsld::rel_type_delete -rel_type imsld_on_comp_notif_rel
     imsld::rel_type_delete -rel_type imsld_notif_email_rel
     imsld::rel_type_delete -rel_type imsld_send_mail_serv_data_rel
-    imsld::rel_type_delete -rel_type imsld_run_time_activities_rel
 }
 
 ad_proc -public imsld::uninstall::delete_ext_rels {  
Index: openacs-4/packages/imsld/tcl/imsld-monitor-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-monitor-procs.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/imsld/tcl/imsld-monitor-procs.tcl	21 Dec 2006 15:20:47 -0000	1.1
@@ -0,0 +1,833 @@
+# /packages/imsld/tcl/imsld-monitor-procs.tcl
+
+ad_library {
+    Procedures in the imsld::monitor namespace.
+    
+    @creation-date Nov 2006
+    @author jopez@inv.it.uc3m.es
+    @cvs-id $Id: imsld-monitor-procs.tcl,v 1.1 2006/12/21 15:20:47 josee Exp $
+}
+
+namespace eval imsld::monitor {}
+
+ad_proc -public imsld::monitor::structure_activities_list {
+    -imsld_id
+    -run_id
+    -structure_item_id
+    -role_part_id
+    -play_id
+    -act_id
+    -dom_node
+    -dom_doc
+} {
+    @param imsld_id
+    @param run_id
+    @param structure_item_id
+    @param role_part_id
+    @param play_id
+    @param act_id
+
+    @return A list of lists of the activities referenced from the activity structure
+} {
+    # auxiliary list to store the activities
+    set completed_list [list]
+    # get the structure info
+    db_1row structure_info { 
+        select structure_id,
+        structure_type
+        from imsld_activity_structuresi
+        where item_id = :structure_item_id
+    }
+    # get the referenced activities which are referenced from the structure
+    foreach referenced_activity [db_list_of_lists struct_referenced_activities {
+        select ar.object_id_two,
+        ar.rel_type,
+        ar.rel_id
+        from acs_rels ar, imsld_activity_structuresi ias
+        where ar.object_id_one = ias.item_id
+        and ias.structure_id = :structure_id
+        order by ar.object_id_two
+    }] {
+        # get all the directly referenced activities (from the activity structure)
+        set object_id_two [lindex $referenced_activity 0]
+        set rel_type [lindex $referenced_activity 1]
+        set rel_id [lindex $referenced_activity 2]
+        switch $rel_type {
+            imsld_as_la_rel {
+                # add the activiti to the TCL list
+                db_1row get_learning_activity_info {
+                    select la.title as activity_title,
+                    la.item_id as activity_item_id,
+                    la.activity_id,
+                    la.complete_act_id
+                    from imsld_learning_activitiesi la
+                    where la.item_id = :object_id_two
+                    and content_revision__is_live(la.activity_id) = 't'
+                }
+                db_1row get_sort_order {
+                    select sort_order from imsld_as_la_rels where rel_id = :rel_id
+                }
+                set activity_node [$dom_doc createElement li]
+                $activity_node setAttribute class "liOpen"
+
+                set a_node [$dom_doc createElement a]
+                $a_node setAttribute href "[export_vars -base "activity-frame" -url {activity_id run_id {type "learning"}}]"
+                $a_node setAttribute target "content"
+                set text [$dom_doc createTextNode "$activity_title"]
+                $a_node appendChild $text
+                $activity_node appendChild $a_node
+                
+                set text [$dom_doc createTextNode " "]
+                $activity_node appendChild $text
+
+                set info_node [$dom_doc createElement a]
+                $info_node setAttribute href "[export_vars -base "activity-frame" -url {activity_id run_id {type "learning"}}]"
+                $info_node setAttribute target "content"
+                set text [$dom_doc createTextNode "([imsld::monitor::number_of_visitors -run_id $run_id -revision_id $activity_id -type "activity"])"]
+                $info_node appendChild $text
+                $activity_node appendChild $info_node
+
+                set completed_list [linsert $completed_list $sort_order [$activity_node asList]]
+            }
+            imsld_as_sa_rel {
+                # add the activiti to the TCL list
+                db_1row get_support_activity_info {
+                    select sa.title as activity_title,
+                    sa.item_id as activity_item_id,
+                    sa.activity_id,
+                    sa.complete_act_id
+                    from imsld_support_activitiesi sa
+                    where sa.item_id = :object_id_two
+                    and content_revision__is_live(sa.activity_id) = 't'
+                }
+                db_1row get_sort_order {
+                    select sort_order from imsld_as_sa_rels where rel_id = :rel_id
+                }
+
+                set activity_node [$dom_doc createElement li]
+                $activity_node setAttribute class "liOpen"
+                set a_node [$dom_doc createElement a]
+                $a_node setAttribute href "[export_vars -base "activity-frame" -url {activity_id run_id {type "support"}}]"
+                $a_node setAttribute target "content"
+                set text [$dom_doc createTextNode "$activity_title"]
+                $a_node appendChild $text
+                $activity_node appendChild $a_node
+
+                set text [$dom_doc createTextNode " "]
+                $activity_node appendChild $text
+
+                set info_node [$dom_doc createElement a]
+                $info_node setAttribute href "[export_vars -base "activity-frame" -url {activity_id run_id {type "support"}}]"
+                $info_node setAttribute target "content"
+                set text [$dom_doc createTextNode "([imsld::monitor::number_of_visitors -run_id $run_id -revision_id $activity_id -type "activity"])"]
+                $info_node appendChild $text
+                $activity_node appendChild $info_node
+
+                set completed_list [linsert $completed_list $sort_order [$activity_node asList]]
+            }
+            imsld_as_as_rel {
+                db_1row get_activity_structure_info {
+                    select title as activity_title,
+                    item_id as structure_item_id,
+                    structure_id,
+                    structure_type
+                    from imsld_activity_structuresi
+                    where item_id = :object_id_two
+                    and content_revision__is_live(structure_id) = 't'
+                }
+                db_1row get_sort_order {
+                    select sort_order from imsld_as_as_rels where rel_id = :rel_id
+                }
+
+                set structure_node [$dom_doc createElement li]
+                $structure_node setAttribute class "liOpen"
+                set a_node [$dom_doc createElement a]
+                $a_node setAttribute href "[export_vars -base "activity-frame" -url {activity_id run_id {type "structure"}}]"
+                $a_node setAttribute target "content"
+                set text [$dom_doc createTextNode "$activity_title"]
+                $a_node appendChild $text
+                $structure_node appendChild $a_node
+
+                set text [$dom_doc createTextNode " "]
+                $structure_node appendChild $text
+                
+                set info_node [$dom_doc createElement a]
+                $info_node setAttribute href "[export_vars -base "activity-frame" -url {activity_id run_id {type "structure"}}]"
+                $info_node setAttribute target "content"
+                set text [$dom_doc createTextNode "([imsld::monitor::number_of_visitors -run_id $run_id -revision_id $structure_id -type "activity"])"]
+                $info_node appendChild $text
+                $structure_node appendChild $info_node
+
+                set nested_activities_list [imsld::monitor::structure_activities_list -imsld_id $imsld_id \
+                                                -run_id $run_id \
+                                                -structure_item_id $structure_item_id \
+                                                -role_part_id $role_part_id \
+                                                -play_id $play_id \
+                                                -act_id $act_id \
+                                                -dom_node $structure_node \
+                                                -dom_doc $dom_doc]
+                set ul_node [$dom_doc createElement ul]
+                foreach nested_activity $nested_activities_list {
+                    $ul_node appendFromList $nested_activity
+                }
+                $structure_node appendChild $ul_node
+                set completed_list [linsert $completed_list $sort_order [$structure_node asList]]
+            }
+        }
+    }
+    return $completed_list
+}
+
+ad_proc -public imsld::monitor::activities_tree {
+    -run_id:required
+    -dom_node
+    -dom_doc
+} {
+    @param run_id
+    @param dom_node
+    @param dom_doc
+
+    @return A list of lists of all the activities in the run
+} {
+    db_1row imsld_info {
+        select imsld_id 
+        from imsld_runs
+        where run_id = :run_id
+    }
+
+    # get the referenced role parts
+    foreach role_part_list [db_list_of_lists referenced_role_parts {
+        select case
+        when rp.learning_activity_id is not null
+        then 'learning'
+        when rp.support_activity_id is not null
+        then 'support'
+        when rp.activity_structure_id is not null
+        then 'structure'
+        else 'none'
+        end as type,
+        content_item__get_live_revision(coalesce(rp.learning_activity_id,rp.support_activity_id,rp.activity_structure_id)) as activity_id,
+        rp.role_part_id,
+        ia.act_id,
+        ip.play_id
+        from imsld_role_partsi rp, imsld_actsi ia, imsld_playsi ip, imsld_imsldsi ii,
+        imsld_methodsi im
+        where  rp.act_id = ia.item_id
+        and ia.play_id = ip.item_id
+        and ip.method_id = im.item_id
+        and im.imsld_id = ii.item_id
+        and ii.imsld_id = :imsld_id
+        and content_revision__is_live(rp.role_part_id) = 't'
+        order by ip.sort_order, ia.sort_order, rp.sort_order
+    }] {
+        set type [lindex $role_part_list 0]
+        set activity_id [lindex $role_part_list 1]
+        set role_part_id [lindex $role_part_list 2]
+        set act_id [lindex $role_part_list 3]        
+        set play_id [lindex $role_part_list 4]
+        switch $type {
+            learning {
+                # add the learning activity to the tree
+                db_1row get_learning_activity_info {
+                    select la.title as activity_title,
+                    la.item_id as activity_item_id,
+                    la.activity_id,
+                    la.complete_act_id
+                    from imsld_learning_activitiesi la
+                    where activity_id = :activity_id
+                }
+                set activity_node [$dom_doc createElement li]
+                $activity_node setAttribute class "liOpen"
+                set a_node [$dom_doc createElement a]
+                $a_node setAttribute href "[export_vars -base "activity-frame" -url {activity_id run_id {type "learning"}}]"
+                $a_node setAttribute target "content"
+                set text [$dom_doc createTextNode "$activity_title"]
+                $a_node appendChild $text
+                $activity_node appendChild $a_node
+
+                set text [$dom_doc createTextNode " "]
+                $activity_node appendChild $text
+                
+                set info_node [$dom_doc createElement a]
+                $info_node setAttribute href "[export_vars -base "activity-frame" -url {activity_id run_id {type "learning"}}]"
+                $info_node setAttribute target "content"
+                set text [$dom_doc createTextNode "([imsld::monitor::number_of_visitors -run_id $run_id -revision_id $activity_id -type "activity"])"]
+                $info_node appendChild $text
+                $activity_node appendChild $info_node
+                
+                $dom_node appendChild $activity_node
+            }
+            support {
+                # add the support activity to the tree
+                db_1row get_support_activity_info {
+                    select sa.title as activity_title,
+                    sa.item_id as activity_item_id,
+                    sa.activity_id,
+                    sa.complete_act_id
+                    from imsld_support_activitiesi sa
+                    where sa.activity_id = :activity_id
+                }
+                set activity_node [$dom_doc createElement li]
+                $activity_node setAttribute class "liOpen"
+                set a_node [$dom_doc createElement a]
+                $a_node setAttribute href "[export_vars -base "activity-frame" -url {activity_id run_id {type "support"}}]"
+                $a_node setAttribute target "content"
+                set text [$dom_doc createTextNode "$activity_title"]
+                $a_node appendChild $text
+                $activity_node appendChild $a_node
+                
+                set text [$dom_doc createTextNode " "]
+                $activity_node appendChild $text
+                    
+                set info_node [$dom_doc createElement a]
+                $info_node setAttribute href "[export_vars -base "activity-frame" -url {activity_id run_id {type "support"}}]"
+                $info_node setAttribute target "content"
+                set text [$dom_doc createTextNode "([imsld::monitor::number_of_visitors -run_id $run_id -revision_id $activity_id -type "activity"])"]
+                $info_node appendChild $text
+                $activity_node appendChild $info_node
+                
+                $dom_node appendChild $activity_node
+            }
+            structure {
+                db_1row get_activity_structure_info {
+                    select title as activity_title,
+                    item_id as structure_item_id,
+                    structure_id,
+                    structure_type
+                    from imsld_activity_structuresi
+                    where structure_id = :activity_id
+                }
+
+                set structure_node [$dom_doc createElement li]
+                $structure_node setAttribute class "liOpen"
+                set a_node [$dom_doc createElement a]
+                $a_node setAttribute href "[export_vars -base "activity-frame" -url {activity_id run_id {type "structure"}}]"
+                $a_node setAttribute target "content"
+                set text [$dom_doc createTextNode "$activity_title"]
+                $a_node appendChild $text
+                $structure_node appendChild $a_node
+
+                set text [$dom_doc createTextNode " "]
+                $structure_node appendChild $text
+
+                set info_node [$dom_doc createElement a]
+                $info_node setAttribute href "[export_vars -base "activity-frame" -url {activity_id run_id {type "structure"}}]"
+                $info_node setAttribute target "content"
+                set text [$dom_doc createTextNode "([imsld::monitor::number_of_visitors -run_id $run_id -revision_id $structure_id -type "activity"])"]
+                $info_node appendChild $text
+                $structure_node appendChild $info_node
+
+                set nested_list [imsld::monitor::structure_activities_list -imsld_id $imsld_id \
+                                     -run_id $run_id \
+                                     -structure_item_id $structure_item_id \
+                                     -role_part_id $role_part_id \
+                                     -play_id $play_id \
+                                     -act_id $act_id \
+                                     -dom_doc $dom_doc \
+                                     -dom_node $dom_node]
+                # the nested finished activities are returned as a tcl list in tDOM format
+                $structure_node appendFromList [list ul [list] [concat [list] $nested_list]]
+                $dom_node appendChild $structure_node
+            }
+        }
+    }
+}
+
+ad_proc -public imsld::monitor::runtime_assigned_activities_tree {
+    -run_id:required
+    -dom_node
+    -dom_doc
+} {
+    @param run_id
+    @param dom_node
+    @param dom_doc
+
+    @return A list of lists of the activities 
+} {
+    # context info
+    db_1row imsld_info {
+        select imsld_id 
+        from imsld_runs
+        where run_id = :run_id
+    }
+    
+    # 1. get any related activities to the rurn with the rel imsld_run_time_activities_rel
+    # 2. get the info of those activities (role_part_id, act_id, play_id) and generate the list
+    #    NOTE: the activity will be shown only once, no matter from how many role parts it is referenced
+
+    # get the referenced activities to the run, assigned at runtime (notifications, level C)
+
+    foreach activity_id [db_list runtime_activities {
+        select distinct(activity_id) as activity_id
+        from imsld_runtime_activities_rels
+        where run_id = :run_id
+    } ] {
+        # get the activity_type
+        if { [db_0or1row learning_activity_p {
+            select 1
+            from imsld_learning_activities
+            where activity_id = :activity_id
+        }] } {
+            set activity_type learning
+        } else {
+            set activity_type support
+        }
+        set role_part_id [imsld::get_role_part_from_activity -activity_type $activity_type -leaf_id [content::revision::item_id -revision_id $activity_id]]
+        
+        # role_part context info
+        db_1row role_part_context {
+            select ia.act_id,
+            ip.play_id
+            from imsld_role_parts rp,
+            imsld_actsi ia,
+            imsld_playsi ip
+            where rp.act_id = ia.item_id
+            and ia.play_id = ip.item_id
+            and rp.role_part_id = :role_part_id
+            and content_revision__is_live(ip.play_id) = 't'
+        }
+
+        switch $activity_type {
+            learning {
+                # add the learning activity to the tree
+                db_1row get_learning_activity_info {
+                    select la.title as activity_title,
+                    la.item_id as activity_item_id,
+                    la.activity_id,
+                    la.complete_act_id
+                    from imsld_learning_activitiesi la
+                    where activity_id = :activity_id
+                }
+
+                set activity_node [$dom_doc createElement li]
+                $activity_node setAttribute class "liOpen"
+                set a_node [$dom_doc createElement a]
+                $a_node setAttribute href "[export_vars -base "activity-frame" -url {activity_id run_id {type "learning"}}]"
+                $a_node setAttribute target "content"
+                set text [$dom_doc createTextNode "$activity_title"]
+                $a_node appendChild $text
+                $activity_node appendChild $a_node
+                
+                set text [$dom_doc createTextNode " "]
+                $activity_node appendChild $text
+                set info_node [$dom_doc createElement a]
+                $info_node setAttribute href "[export_vars -base "activity-frame" -url {activity_id run_id {type "learning"}}]"
+                $info_node setAttribute target "content"
+                set text [$dom_doc createTextNode "([imsld::monitor::number_of_visitors -run_id $run_id -revision_id $activity_id -type "activity"])"]
+                $info_node appendChild $text
+                $activity_node appendChild $info_node                
+
+                $dom_node appendChild $activity_node
+            }
+            support {
+                # add the support activity to the tree
+                db_1row get_support_activity_info {
+                    select sa.title as activity_title,
+                    sa.item_id as activity_item_id,
+                    sa.activity_id,
+                    sa.complete_act_id
+                    from imsld_support_activitiesi sa
+                    where sa.activity_id = :activity_id
+                }
+
+                set activity_node [$dom_doc createElement li]
+                $activity_node setAttribute class "liOpen"
+                set a_node [$dom_doc createElement a]
+                $a_node setAttribute href "[export_vars -base "activity-frame" -url {activity_id run_id {type "support"}}]"
+                $a_node setAttribute target "content"
+                set text [$dom_doc createTextNode "$activity_title"]
+                $a_node appendChild $text
+                $activity_node appendChild $a_node
+                
+                set text [$dom_doc createTextNode " "]
+                $activity_node appendChild $text
+                
+                set info_node [$dom_doc createElement a]
+                $info_node setAttribute href "[export_vars -base "activity-frame" -url {activity_id run_id {type "support"}}]"
+                $info_node setAttribute target "content"
+                set text [$dom_doc createTextNode "([imsld::monitor::number_of_visitors -run_id $run_id -revision_id $activity_id -type "activity"])"]
+                $info_node appendChild $text
+                $activity_node appendChild $info_node
+                
+                $dom_node appendChild $activity_node
+            }
+        }
+    }
+}
+
+ad_proc -public imsld::monitor::environment_as_ul {
+    -environment_item_id:required
+    -run_id:required
+    -dom_node:required
+    -dom_doc:required
+} { 
+    @param environment_item_id
+    @param run_id
+    @option resource_mode
+    @param dom_node
+    @param dom_doc
+
+    @return a html list (in a dom tree) of the associated resources, files and environments referenced from the given environment.
+} {  
+    # get environment info
+    db_1row environment_info {
+        select env.title as environment_title,
+        env.environment_id
+        from imsld_environmentsi env
+        where env.item_id = :environment_item_id
+        and content_revision__is_live(env.environment_id) = 't'
+    }
+
+    set environment_node_li [$dom_doc createElement li]
+    $environment_node_li setAttribute class "liOpen"
+    set text [$dom_doc createTextNode "$environment_title"]
+    $environment_node_li appendChild $text
+    set environment_node [$dom_doc createElement ul]
+    # FIX-ME: if the ul is empty, the browser shows the ul incorrectly
+    set text [$dom_doc createTextNode ""]    
+    $environment_node appendChild $text
+
+    foreach learning_objects_list [db_list_of_lists get_learning_object_info {
+        select lo.item_id as learning_object_item_id,
+        lo.learning_object_id,
+        lo.identifier,
+        coalesce(lo.title,lo.identifier) as lo_title,
+        lo.class
+        from imsld_learning_objectsi lo
+        where lo.environment_id = :environment_item_id
+        and content_revision__is_live(lo.learning_object_id) = 't'
+        order by lo.creation_date
+    }] {
+        set learning_object_item_id [lindex $learning_objects_list 0]
+        set learning_object_id [lindex $learning_objects_list 1]
+        set identifier [lindex $learning_objects_list 2]
+        set lo_title [lindex $learning_objects_list 3]
+        set class_name [lindex $learning_objects_list 4]
+
+        # learning object item. get the files associated
+        set linear_item_list [db_list_of_lists item_linear_list {
+            select ii.imsld_item_id
+            from imsld_items ii,
+            cr_items cr,
+            acs_rels ar
+            where ar.object_id_one = :learning_object_item_id
+            and ar.object_id_two = cr.item_id
+            and cr.live_revision = ii.imsld_item_id
+        }]
+        foreach imsld_item_id $linear_item_list {
+            foreach environments_list [db_list_of_lists env_nested_associated_items {
+                select cpr.resource_id,
+                cr2.item_id as resource_item_id,
+                cpr.type as resource_type
+                from imsld_cp_resources cpr, imsld_items ii,
+                acs_rels ar, cr_items cr1, cr_items cr2
+                where ar.object_id_one = cr1.item_id
+                and ar.object_id_two = cr2.item_id
+                and cr1.live_revision = ii.imsld_item_id
+                and cr2.live_revision = cpr.resource_id 
+                and (imsld_tree_sortkey between tree_left((select imsld_tree_sortkey from imsld_items where imsld_item_id = :imsld_item_id))
+                     and tree_right((select imsld_tree_sortkey from imsld_items where imsld_item_id = :imsld_item_id))
+                     or ii.imsld_item_id = :imsld_item_id)
+            }] {
+                set resource_id [lindex $environments_list 0]
+                set resource_item_id [lindex $environments_list 1]
+                set resource_type [lindex $environments_list 2]
+
+                set lo_node [$dom_doc createElement li]
+                $lo_node setAttribute class "liOpen"
+                set a_node [$dom_doc createElement a]
+                $a_node setAttribute href "[export_vars -base "activity-frame" -url {run_id learning_object_id {type learning_object}}]"
+                $a_node setAttribute target "content"
+                set text [$dom_doc createTextNode "$lo_title"]
+                $a_node appendChild $text
+                $lo_node appendChild $a_node
+                
+                set text [$dom_doc createTextNode " "]
+                $lo_node appendChild $text
+                
+                set info_node [$dom_doc createElement a]
+                $info_node setAttribute href "[export_vars -base "activity-frame" -url {run_id learning_object_id {type learning_object}}]"
+                $info_node setAttribute target "content"
+                set text [$dom_doc createTextNode "([imsld::monitor::number_of_visitors -run_id $run_id -revision_id $learning_object_id -item_id $learning_object_item_id -type "learning_object"])"]
+                $info_node appendChild $text
+                $lo_node appendChild $info_node
+                
+                $environment_node appendChild $lo_node
+            } 
+        }
+    }
+
+    # services
+    foreach services_list [db_list_of_lists get_service_info {
+        select ise.service_id,
+        ise.item_id as service_item_id,
+        ise.identifier,
+        ise.service_type,
+        ise.title as service_title,
+        ise.class
+        from imsld_servicesi ise
+        where ise.environment_id = :environment_item_id
+        and content_revision__is_live(ise.service_id) = 't'
+    }] {
+        set service_id [lindex $services_list 0]
+        set service_item_id [lindex $services_list 1]
+        set identifier [lindex $services_list 2]
+        set service_type [lindex $services_list 3]
+        set service_title [expr { [string eq [lindex $services_list 4] ""] ? $environment_title : [lindex $services_list 4] }]
+        set class_name [lindex $services_list 5]
+
+        set service_node [$dom_doc createElement li]
+        $service_node setAttribute class "liOpen"
+        set a_node [$dom_doc createElement a]
+        $a_node setAttribute href "[export_vars -base "activity-frame" -url {run_id service_id {type service}}]"
+        $a_node setAttribute target "content"
+        set text [$dom_doc createTextNode "$service_title"]
+        $a_node appendChild $text
+        $service_node appendChild $a_node
+        
+        set text [$dom_doc createTextNode " "]
+        $service_node appendChild $text
+        
+        set info_node [$dom_doc createElement a]
+        $info_node setAttribute href "[export_vars -base "activity-frame" -url {run_id service_id {type service}}]"
+        $info_node setAttribute target "content"
+        set text [$dom_doc createTextNode "([imsld::monitor::number_of_visitors -run_id $run_id -revision_id $service_id -type "service"])"]
+        $info_node appendChild $text
+        $service_node appendChild $info_node
+        
+        $environment_node appendChild $service_node
+
+    }
+
+    # environments
+    foreach nested_environment_item_id [db_list nested_environment {
+        select ar.object_id_two as nested_environment_item_id
+        from acs_rels ar
+        where ar.object_id_one = :environment_item_id
+        and ar.rel_type = 'imsld_env_env_rel'
+    }] {
+        imsld::monitor::process_environment_as_ul -environment_item_id $nested_environment_item_id \
+            -run_id $run_id \
+            -resource_mode $resource_mode \
+            -dom_node $environment_node \
+            -dom_doc $dom_doc
+    }
+    $environment_node_li appendChild $environment_node
+    $dom_node appendChild $environment_node_li
+}
+
+ad_proc -public imsld::monitor::activity_environments_tree {
+    -activity_item_id:required
+    -run_id:required
+    -dom_node
+    -dom_doc
+} {
+    @param activity_item_id
+    @param run_id
+    @param rel_type
+    @param dom_node
+    @param dom_doc
+    
+    @return The html list (using tdom) of resources (learning objects and services) associated to the activity's environment(s)
+} {
+    # get the rel_type
+    if { [db_0or1row is_imsld {
+        select 1 from imsld_imsldsi where item_id = :activity_item_id
+    }] } {
+        return ""
+    } elseif { [db_0or1row is_learning {
+        select 1 from imsld_learning_activitiesi where item_id = :activity_item_id
+    }] } {
+        set rel_type imsld_la_env_rel
+    } elseif { [db_0or1row is_support {
+        select 1 from imsld_support_activitiesi where item_id = :activity_item_id
+    }] } {
+        set rel_type imsld_sa_env_rel
+    } elseif { [db_0or1row is_structure {
+        select 1 from imsld_activity_structuresi where item_id = :activity_item_id
+    }] } {
+        set rel_type imsld_as_env_rel
+    } else {
+        return -code error "IMSLD::imsld::monitor::activity_environments_tree: Invalid call"
+    }
+    # get environments
+    set environments_list [list]
+    set associated_environments_list [db_list la_associated_environments {
+        select ar.object_id_two as environment_item_id
+        from acs_rels ar
+        where ar.object_id_one = :activity_item_id
+        and ar.rel_type = :rel_type
+        order by ar.object_id_two
+    }]
+    foreach environment_item_id $associated_environments_list {
+        imsld::monitor::environment_as_ul -environment_item_id $environment_item_id \
+            -run_id $run_id \
+            -dom_node $dom_node \
+            -dom_doc $dom_doc
+    }
+}
+
+ad_proc -public imsld::monitor::number_of_visitors {
+    -run_id:required
+    -revision_id:required
+    -item_id
+    -type
+} {
+    @param revision_id
+    @param item_id
+    @param type
+    
+    @return The number of visitors of the activity/environment
+} {
+    set number_of_visitors 0
+
+    switch $type {
+        activity {
+            set number_of_visitors [db_string visitors_count {
+                select count(distinct(user_id))
+                from imsld_status_user
+                where status = 'started'
+                and run_id = :run_id
+                and related_id = :revision_id
+            } -default 0]
+        }
+        learning_object {
+            set item_list [db_list item_linear_list {
+                select ii.imsld_item_id
+                from imsld_items ii,
+                cr_items cr,
+                acs_rels ar
+                where ar.object_id_one = :item_id
+                and ar.object_id_two = cr.item_id
+                and cr.live_revision = ii.imsld_item_id}]
+            
+            foreach imsld_item_id $item_list {
+                lappend related_resources [db_list resources_list {
+                    select cpr.resource_id
+                    from imsld_cp_resources cpr, imsld_items ii,
+                    acs_rels ar, cr_items cr1, cr_items cr2
+                    where ar.object_id_one = cr1.item_id
+                    and ar.object_id_two = cr2.item_id
+                    and cr1.live_revision = ii.imsld_item_id
+                    and cr2.live_revision = cpr.resource_id 
+                    and (imsld_tree_sortkey between tree_left((select imsld_tree_sortkey from imsld_items where imsld_item_id = :imsld_item_id))
+                         and tree_right((select imsld_tree_sortkey from imsld_items where imsld_item_id = :imsld_item_id))
+                         or ii.imsld_item_id = :imsld_item_id)}]
+            }
+            
+            foreach resource_id $related_resources {
+                incr number_of_visitors [db_string get_visitors {
+                    select count(distinct(stat.user_id))
+                    from imsld_status_user stat
+                    where stat.run_id = :run_id
+                    and related_id = :resource_id
+                    and stat.status = 'finished'
+                }]
+            }
+        }
+        service {
+            
+            db_1row service_info {
+                select service_type,
+                item_id as service_item_id
+                from imsld_servicesi
+                where service_id = :revision_id
+            }
+
+            switch $service_type {
+                conference {
+                    db_1row conference_info {
+                        select conf.conference_id,
+                        conf.imsld_item_id as imsld_item_item_id,
+                        cr.live_revision as imsld_item_id, 
+                        conf.title as conf_title
+                        from imsld_conference_servicesi conf, cr_items cr
+                        where conf.service_id = :service_item_id
+                        and cr.item_id = conf.imsld_item_id
+                        and content_revision__is_live(cr.live_revision) = 't'
+                    }
+
+                    set related_resources [db_list conf_resources_list {
+                        select cpr.resource_id
+                        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 (imsld_tree_sortkey between tree_left((select imsld_tree_sortkey from imsld_items where imsld_item_id = :imsld_item_id))
+                             and tree_right((select imsld_tree_sortkey from imsld_items where imsld_item_id = :imsld_item_id))
+                             or ii.imsld_item_id = :imsld_item_id)
+                    }]
+                    set resources_count [llength $related_resources]
+
+                    set number_of_visitors [llength [db_list count_visitors "
+                        select count(user_id)
+                        from imsld_status_user
+                        where related_id in ([join $related_resources ","])
+                        and status = 'finished'
+                        and run_id = :run_id
+                        group by user_id
+                        having count(*) = [llength $related_resources]
+                    "]]
+                    
+                } monitor {
+                    db_1row monitor_info {
+                        select ims.monitor_id,
+                        ims.item_id as monitor_item_id,
+                        cr.live_revision as imsld_item_id
+                        from imsld_monitor_servicesi ims, cr_items cr
+                        where ims.service_id = :service_item_id
+                        and cr.item_id = ims.imsld_item_id
+                        and content_revision__is_live(cr.live_revision) = 't'
+                    }
+                    
+                    set related_resources [db_list conf_resources_list {
+                        select cpr.resource_id
+                        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 (imsld_tree_sortkey between tree_left((select imsld_tree_sortkey from imsld_items where imsld_item_id = :imsld_item_id))
+                             and tree_right((select imsld_tree_sortkey from imsld_items where imsld_item_id = :imsld_item_id))
+                             or ii.imsld_item_id = :imsld_item_id)
+                    }]
+
+                    set number_of_visitors [llength [db_list count_visitors "
+                        select count(user_id)
+                        from imsld_status_user
+                        where related_id in ([join $related_resources ","])
+                        and status = 'finished'
+                        and run_id = :run_id
+                        group by user_id
+                        having count(*) = [llength $related_resources]
+                    "]]
+
+                } send-mail {
+                    # 1. get the users associated to the run
+                    # 2. get the users IN the run who have sent a bulk-mail message
+
+                    # NOTE: The bulk mail package has a bug when storing the send_date (it's stored in YYYY-MM-DD format, withot the hour)
+                    #       that's  why we have to do a little trick with the dates when comparing them, even though it's not 100% accurate
+                    set number_of_visitors [db_string count_visitors {
+                        select count(distinct(gmm.member_id))
+                        from group_member_map gmm,
+                        imsld_run_users_group_ext iruge, 
+                        acs_rels ar1,
+                        imsld_runs ir,
+                        acs_objects ao,
+                        bulk_mail_messages bm
+                        where iruge.run_id=:run_id
+                        and iruge.run_id = ir.run_id
+                        and ar1.object_id_two=iruge.group_id 
+                        and ar1.object_id_one=gmm.group_id 
+                        and ao.object_id = bm.bulk_mail_id
+                        and ao.creation_user = gmm.member_id
+                        and to_date(bm.send_date,'YYYY-MM-DD') >= to_date(ir.creation_date,'YYYY-MM-DD')
+                    } -default 0]
+                }
+            }
+        }
+    }
+    return $number_of_visitors
+}
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.92 -r1.93
--- openacs-4/packages/imsld/tcl/imsld-procs.tcl	21 Dec 2006 12:08:36 -0000	1.92
+++ openacs-4/packages/imsld/tcl/imsld-procs.tcl	21 Dec 2006 15:20:47 -0000	1.93
@@ -9,6 +9,7 @@
 }
 
 namespace eval imsld {}
+namespace eval imsld::map {}
 
 ad_proc -public imsld::safe_url_name { 
     -name:required
@@ -61,6 +62,34 @@
     return $image_path
 } 
 
+ad_proc -public imsld::map::role_to_activity { 
+    -run_id
+    -activity_id
+    -role_id
+} { 
+    @param run_id
+    @param activity_id
+    @param role_id
+    
+    @return The rel_id created
+} {
+    if { [db_0or1row existing_rel {
+        select rel_id
+        from imsld_runtime_activities_rels
+        where run_id = :run_id
+        and activity_id = :activity_id
+        and role_id = :role_id
+    }] } {
+        return $rel_id
+    }
+    
+    set rel_id [db_nextval acs_object_id_seq]
+    db_dml insert_mapping {
+        insert into imsld_runtime_activities_rels (rel_id, run_id, activity_id, role_id)
+        select imsld_rar_seq.nextval, :run_id, :activity_id, :role_id from dual
+    }
+} 
+
 ad_proc -public imsld::get_role_part_from_activity {
     -activity_type
     -leaf_id
@@ -750,7 +779,11 @@
     # add the activity to the rel imsld_run_time_activities_rel
     if { ![string eq "" $activity_id] && ![db_0or1row already_mapped { *SQL* }] } {
         # map the activity to the role
-        relation_add imsld_run_time_activities_rel $role_id $activity_id
+        # NOTE: this mappnig couldn't be done using acs_rels becuase we could map more than once the same activity with the same role,
+        # with differnet context info (run_id), but that's not taken into account when creating the acs rel even tough if when creating the rel 
+        # we indicate that the rel info is stored in other table....
+
+        imsld::map::role_to_activity -run_id $run_id -activity_id $activity_id -role_id $role_id
     }
     # send a notification (email) to each user in the role
     foreach recipient_user_id [imsld::roles::get_users_in_role -role_id $role_id -run_id $run_id] {
@@ -1641,8 +1674,8 @@
                 imsld::process_resource_as_ul -resource_item_id $resource_item_id \
                     -run_id $run_id \
                     -dom_node $dom_node \
-                    -dom_doc $dom_doc
-
+                    -dom_doc $dom_doc \
+                    -li_mode
                 # replace the image with the conference name
                 set img_nodes [$dom_node selectNodes {.//img}]
                 foreach img_node $img_nodes {
@@ -1655,40 +1688,41 @@
                 ns_log notice "[_ imsld.lt_li_desc_no_file_assoc]"
             }
         }
-
         send-mail {
             # FIX ME: Currently only one send-mail-data is supported
             set resource_item_list [list]
 
             db_1row get_send_mail_info { *SQL* }
-
             set send_mail_node_li [$dom_doc createElement li]
             set a_node [$dom_doc createElement a]
-            
-            $a_node setAttribute href "[export_vars -base "[dotlrn_community::get_community_url [dotlrn_community::get_community_id]]imsld/imsld-sendmail" {{send_mail_id $sendmail_id} {run_id $run_id}}]"
+            $a_node setAttribute href [export_vars -base "[dotlrn_community::get_community_url [dotlrn_community::get_community_id]]imsld/imsld-sendmail" {{send_mail_id $sendmail_id} {run_id $run_id}}]            
             set service_title [$dom_doc createTextNode "$send_mail_title"]
             $a_node setAttribute target "content"
             $a_node appendChild $service_title
             $send_mail_node_li appendChild $a_node
             $dom_node appendChild $send_mail_node_li
         }
-        
         monitor {
             set resource_item_list [list]
+            set imsld_package_id [site_node_apm_integration::get_child_package_id \
+                                      -package_id [dotlrn_community::get_package_id [dotlrn_community::get_community_id]] \
+                                      -package_key "[imsld::package_key]"]
             db_1row monitor_service_info { *SQL* }
             db_foreach monitor_associated_items { *SQL* } {
+
                 lappend resource_item_list $resource_item_id
+                set monitor_node_li [$dom_doc createElement li]
+                set a_node [$dom_doc createElement a]
+                set file_url [export_vars -base "[dotlrn_community::get_community_url [dotlrn_community::get_community_id]]imsld/monitor-frame" { monitor_id }]
+                $a_node setAttribute href [export_vars -base "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]imsld-finish-resource" {file_url $file_url resource_item_id $resource_item_id run_id $run_id}]
+                $a_node setAttribute target "content"
+                set service_title [$dom_doc createTextNode "$monitor_service_title"]
+                $a_node appendChild $service_title
+                $monitor_node_li appendChild $a_node
+                $dom_node appendChild $monitor_node_li
+            } if_no_rows {
+                ns_log debug "No monitor info"
             }
-
-            set monitor_node_li [$dom_doc createElement li]
-            set a_node [$dom_doc createElement a]
-            
-            $a_node setAttribute href "[export_vars -base "[dotlrn_community::get_community_url [dotlrn_community::get_community_id]]imsld/monitor-frame" { monitor_id run_id }]"
-            set service_title [$dom_doc createTextNode "$monitor_service_title"]
-            $a_node setAttribute target "content"
-            $a_node appendChild $service_title
-            $monitor_node_li appendChild $a_node
-            $dom_node appendChild $monitor_node_li
         }
 
         default {
@@ -1816,9 +1850,9 @@
     foreach nested_environment_item_id [db_list nested_environment { *SQL* }] {
         set one_nested_environment_list [imsld::process_environment_as_ul -environment_item_id $nested_environment_item_id \
                                              -run_id $run_id \
-                                            -resource_mode $resource_mode \
-                                            -dom_node $environment_node \
-                                            -dom_doc $dom_doc]
+                                             -resource_mode $resource_mode \
+                                             -dom_node $environment_node \
+                                             -dom_doc $dom_doc]
         # the title is stored in [lindex $one_nested_environment_list 0], but is not returned for displaying porpouses
         set nested_environment_list [concat $nested_environment_list \
                                          [lindex $one_nested_environment_list 1] \
@@ -1934,7 +1968,7 @@
             set one_prerequisite_ul [imsld::process_resource_as_ul -resource_item_id $resource_item_id \
                                          -run_id $run_id \
                                          -dom_doc $dom_doc \
-                                         -dom_node $dom_node]
+                                         -dom_node $dom_node
         } if_no_rows {
             ns_log notice "[_ imsld.lt_li_desc_no_file_assoc]"
         }
@@ -2055,10 +2089,11 @@
             set parent_id [lindex $file_list 3]
             # get the fs file path
             set folder_path [db_exec_plsql get_folder_path { *SQL* }]
-            set fs_file_url [db_1row get_fs_file_url { *SQL* }]
+            db_1row get_fs_file_url { *SQL* }
+            set fs_file_url $file_url
             set file_url "imsld-content-serve"
             set a_node [$dom_doc createElement a]
-            $a_node setAttribute href "[export_vars -base "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]imsld-finish-resource" {file_url $file_url resource_item_id $resource_item_id run_id $run_id resource_id $resource_id}]"
+            $a_node setAttribute href "[export_vars -base "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]imsld-finish-resource" {file_url $file_url resource_item_id $resource_item_id run_id $run_id}]"
             set img_node [$dom_doc createElement img]
             $img_node setAttribute src "[imsld::object_type_image_path -object_type file-storage]"
             $img_node setAttribute border "0"
@@ -2312,7 +2347,6 @@
     @option resource_mode default f
     @param dom_node
     @param dom_doc
-
     
     @return The list (activity_name, list of associated urls, using tdom) of the activity in the IMS-LD.
 } {
@@ -2765,6 +2799,7 @@
         and ar.object_id_two = :user_id
         and iruge.run_id = :run_id
     }]
+
     # get the referenced role parts
     foreach role_part_list [db_list_of_lists referenced_role_parts { *SQL* }] {
         set type [lindex $role_part_list 0]
@@ -3364,7 +3399,7 @@
                 select serv.environment_id as environment_item_id
                 from imsld_conference_servicesi ecs,
                 imsld_servicesi serv
-                where ecs.item_id = :object_id_one
+                where ecs.imsld_item_id = :object_id_one
                 and ecs.service_id = serv.item_id
             }] } {
                 set activities_list [concat $activities_list [imsld::get_activity_from_environment -environment_item_id $environment_item_id]]
@@ -3416,8 +3451,6 @@
 
     @author Luis de la Fuente Valent�n (lfuente@it.uc3m.es)
 } {
-
-
     #look for the asociated activities
     set activities_list [imsld::get_activity_from_resource -resource_id $resource_id]
     # process each activity
@@ -3469,7 +3502,7 @@
                     select 1 
                     from imsld_status_user stat, imsld_cp_resourcesi icr
                     where icr.item_id = :res_id
-                    and icr.resource_id = stat.completed_id
+                    and icr.resource_id = stat.related_id
                     and user_id = :user_id
                     and run_id = :run_id
                     and status = 'finished'
@@ -3791,4 +3824,4 @@
    }
 }
 ad_register_proc GET /finish-component-element* imsld::finish_component_element
-ad_register_proc POST /finish-component-elementx* imsld::finish_component_element
+ad_register_proc POST /finish-component-element* imsld::finish_component_element
Index: openacs-4/packages/imsld/tcl/imsld-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-procs.xql,v
diff -u -r1.35 -r1.36
--- openacs-4/packages/imsld/tcl/imsld-procs.xql	3 Nov 2006 14:39:02 -0000	1.35
+++ openacs-4/packages/imsld/tcl/imsld-procs.xql	21 Dec 2006 15:20:47 -0000	1.36
@@ -534,10 +534,10 @@
 		<querytext>
         
         select 1
-        from acs_rels 
-        where object_id_one = :role_id
-        and object_id_two = :activity_id
-        and rel_type = 'imsld_run_time_activities_rel'
+        from imsld_runtime_activities_rels
+        where role_id = :role_id
+        and activity_id = :activity_id
+        and run_id = :run_id
     
 		</querytext>
 	</fullquery>
@@ -1169,15 +1169,13 @@
                 cpr.item_id as resource_item_id,
                 cpr.type as resource_type
                 from imsld_cp_resourcesi cpr, imsld_itemsi ii,
-                acs_rels ar, imsld_res_files_rels map
+                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 (imsld_tree_sortkey between tree_left((select imsld_tree_sortkey from imsld_items where imsld_item_id = :imsld_item_id))
                      and tree_right((select imsld_tree_sortkey from imsld_items where imsld_item_id = :imsld_item_id))
                      or ii.imsld_item_id = :imsld_item_id)
-                and ar.rel_id = map.rel_id
-                and map.displayable_p = 't'
 
          </querytext>
 	</fullquery>
@@ -1496,6 +1494,7 @@
 		<querytext>
 
         select identifier,
+        resource_id,
         type as resource_type,
         title as resource_title,
         acs_object_id
@@ -2047,10 +2046,10 @@
 	<fullquery name="imsld::generate_runtime_assigned_activities_tree.runtime_activities">
 		<querytext>
 
-        select ar.object_id_two as activity_id
-        from acs_rels ar
-        where ar.object_id_one = :user_role_id
-        and ar.rel_type = 'imsld_run_time_activities_rel'
+        select activity_id
+        from imsld_runtime_activities_rels
+        where role_id = :user_role_id
+        and run_id = :run_id
                         
 		</querytext>
 	</fullquery>
@@ -2516,6 +2515,7 @@
                 where related_id = :resource_id
                 and status = 'finished'
                 and run_id = :run_id
+                and user_id = :user_id
 		</querytext>
 	</fullquery>
 
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 -r1.13 -r1.14
--- openacs-4/packages/imsld/www/activity-frame.tcl	24 Oct 2006 10:09:51 -0000	1.13
+++ openacs-4/packages/imsld/www/activity-frame.tcl	21 Dec 2006 15:20:47 -0000	1.14
@@ -127,7 +127,7 @@
             set objectives_list [list]
         }
         set resources_list [concat $resources_list [concat $prerequisites_list $objectives_list]]
-        imsld::grant_permissions -resources_activities_list $resources_list -user_id $user_id      
+        imsld::grant_permissions -resources_activities_list $resources_list -user_id $user_id -run_id $run_id
     }
 
     set activities [$dom_root asXML] 
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.9 -r1.10
--- openacs-4/packages/imsld/www/imsld-finish-resource.tcl	20 Sep 2006 15:04:05 -0000	1.9
+++ openacs-4/packages/imsld/www/imsld-finish-resource.tcl	21 Dec 2006 15:20:47 -0000	1.10
@@ -5,7 +5,6 @@
     file_url
     resource_item_id
     run_id
-    resource_id:optional
     owner_user_id:optional
 }
 
@@ -23,7 +22,38 @@
 }] } {
     imsld::grant_permissions -resources_activities_list $resource_id -user_id [ad_conn user_id]
     imsld::finish_resource -resource_id $resource_id -run_id $run_id
+} else {
+    # mark the resource as finished just for monitoring purposes
+    db_1row context_info {
+        select imsld_id 
+        from imsld_runs
+        where run_id = :run_id
+    }
+    set user_id [ad_conn user_id]
+    set resource_id [content::item::get_live_revision -item_id $resource_item_id]
+    db_dml insert_completed_resource {
+        insert into imsld_status_user (
+                                       imsld_id,
+                                       run_id,
+                                       related_id,
+                                       user_id,
+                                       type,
+                                       status_date,
+                                       status
+                                       )
+        (
+         select :imsld_id,
+         :run_id,
+         :resource_id,
+         :user_id,
+         'resource',
+         now(),
+         'finished'
+         where not exists (select 1 from imsld_status_user where run_id = :run_id and user_id = :user_id and related_id = :resource_id and status = 'finished')
+         )
+    }
 }
+
 if { ![regexp {http://} $file_url] } {
     ad_returnredirect "[export_vars -base "$file_url" -url { file_url run_id resource_id resource_item_id owner_user_id }]"
 } 
Index: openacs-4/packages/imsld/www/imsld-sendmail-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/imsld-sendmail-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/imsld/www/imsld-sendmail-2.tcl	19 May 2006 17:26:02 -0000	1.2
+++ openacs-4/packages/imsld/www/imsld-sendmail-2.tcl	21 Dec 2006 15:20:47 -0000	1.3
@@ -9,13 +9,13 @@
 set users_list [lindex $users_list 0]
 
 if {[string eq $recipients all-in-role]} {
-    #todos los miembros del role: calcula destinatarios, redirige y punto
+    #all the role members: get the receipients, redirects and that's it
 
     
     ad_returnredirect [export_vars -base ../spam {{recipients:multiple $users_list} {referer one-community-admin}}]
     ad_script_abort
 } else {
-    #se puede seleccionar los miembros. hay que hacer un template::list
+    #chosse among members the receiptients. use a template::list
     set page_title "Role members"
     set context {}
     set bulk_actions "{Compose mail} {../spam} {Send mail to selected members}"
Index: openacs-4/packages/imsld/www/imsld-sendmail.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/imsld-sendmail.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/imsld/www/imsld-sendmail.adp	18 May 2006 11:13:01 -0000	1.1
+++ openacs-4/packages/imsld/www/imsld-sendmail.adp	21 Dec 2006 15:20:47 -0000	1.2
@@ -1,7 +1,7 @@
 
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
-  <p><strong>Select a role to send the email</strong></p>
+  <p><strong>#imsld.lt_Select_a_role_to_send#</strong></p>
   <ul>
         <multiple name="all_email_data">
             <li>
@@ -10,3 +10,4 @@
             <br>
         </multiple>
   </ul>
+
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 -r1.11 -r1.12
--- openacs-4/packages/imsld/www/imsld-tree.adp	24 Oct 2006 10:09:51 -0000	1.11
+++ openacs-4/packages/imsld/www/imsld-tree.adp	21 Dec 2006 15:20:47 -0000	1.12
@@ -25,14 +25,37 @@
 padding: 0px;
 margin: 0px;
 }
-div {
+div.role_menu {
     text-align: right;
     font-size: 80%;
+	padding: 0px;      
+	margin: 0px;
+    top: 0px;
+    right: 0px;
 } 
+a.button  {
+	text-align: center;
+	border: 3px outset #00b;
+	background-color: #007; 
+	color: #fff;
+	font-weight: bold;
+	font-size: 10px;
+	text-decoration: none;
+	padding: 0px;      
+	margin: 0px;
+    top: 0px;
+    left: 0px;
+}
+a.button:hover  {
+	color: #fff;
+	background-color: #00d;
+	border: 3px inset #00b;
+}
 </style>
 </head>
 <body>
-<div>
+<a href="@community_url@"  style="display: block; position: fixed;" class="button" target="_top">#imsld.Exit#</a>
+<div class="role_menu">
 <form name="choose-role">
 <select name="current_role_id" id="roles_list" onChange="confirmValue(this.form)">
 <multiple name="possible_roles">
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 -r1.15 -r1.16
--- openacs-4/packages/imsld/www/imsld-tree.tcl	29 Oct 2006 14:58:25 -0000	1.15
+++ openacs-4/packages/imsld/www/imsld-tree.tcl	21 Dec 2006 15:20:47 -0000	1.16
@@ -12,6 +12,7 @@
 set community_id [dotlrn_community::get_community_id]
 set cr_root_folder_id [imsld::cr::get_root_folder -community_id $community_id]
 set user_id [ad_conn user_id]
+set community_url [dotlrn_community::get_community_url $community_id]
 
 db_1row imslds_in_class {
     select imsld.item_id as imsld_item_id,
@@ -127,9 +128,9 @@
     # runtime generated activities (notifications, level C)
     if { [db_string generated_acitivties_p {
         select count(*)
-        from acs_rels
-        where object_id_one = :current_role_id
-        and rel_type = 'imsld_run_time_activities_rel'
+        from imsld_runtime_activities_rels
+        where role_id = :current_role_id
+        and run_id = :run_id
     } -default 0] > 0 } {
         dom createDocument ul aux_doc
         set aux_dom_root [$aux_doc documentElement]
Index: openacs-4/packages/imsld/www/support-activity-roles.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/support-activity-roles.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/imsld/www/support-activity-roles.adp	20 Sep 2006 15:04:05 -0000	1.3
+++ openacs-4/packages/imsld/www/support-activity-roles.adp	21 Dec 2006 15:20:47 -0000	1.4
@@ -3,7 +3,7 @@
 <form name="choose-supported-role" action="">
 <div>
 <select name="role_id" id="supported-roles" onChange="confirmValue(this.form)">
-    <option value="select">Select role to support...</option>
+    <option value="select">#imsld.lt_Select_role_to_suppor#</option>
     <multiple name="role_info">
         <if @role_id@ eq @role_info.role_id@ and @supported_user_id@ not nil>
         <option value="@role_info.role_id@" selected="selected">@role_info.role_name@</option>
@@ -14,7 +14,7 @@
     </multiple>
 </select>
 <select name="supported_user_id" id="user-roles" onChange="confirmValue(this.form)">
-    <option class="select" value="select">Select user to support...</option>
+    <option class="select" value="select">#imsld.lt_Select_user_to_suppor#</option>
     <multiple name="supported_users_in_role">
     <if @supported_user_id@ eq @supported_users_in_role.member_id@>
     <option class="@supported_users_in_role.role_id@" value="@supported_users_in_role.member_id@" selected="selected">@supported_users_in_role.username@</option>
@@ -30,3 +30,4 @@
 </form>
 
 
+
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.7 -r1.8
--- openacs-4/packages/imsld/www/admin/imsld-confirm-finish.tcl	10 Oct 2006 10:58:02 -0000	1.7
+++ openacs-4/packages/imsld/www/admin/imsld-confirm-finish.tcl	21 Dec 2006 15:20:47 -0000	1.8
@@ -34,4 +34,4 @@
 }
 
 
-ad_returnredirect ..
+ad_returnredirect .
Index: openacs-4/packages/imsld/www/admin/imsld-create-instance.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/imsld-create-instance.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/imsld/www/admin/imsld-create-instance.adp	30 Mar 2006 16:01:46 -0000	1.1
+++ openacs-4/packages/imsld/www/admin/imsld-create-instance.adp	21 Dec 2006 15:20:47 -0000	1.2
@@ -1,6 +1,7 @@
 <master>
-<p>Select parent for the new instance</p>
+<p>#imsld.lt_Select_parent_for_the#</p>
 <if @flag@ not nil>
     <listtemplate name="possible_parents"></listtemplate>
 </if>
 
+
Index: openacs-4/packages/imsld/www/admin/imsld-finish.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/imsld-finish.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/imsld/www/admin/imsld-finish.adp	21 Jul 2006 13:12:10 -0000	1.2
+++ openacs-4/packages/imsld/www/admin/imsld-finish.adp	21 Dec 2006 15:20:47 -0000	1.3
@@ -1,24 +1,25 @@
 <master>
 
 <if @warning_flag@ not nil>
-<p><b>Some warnings has been found</b></p>
+<p><b>#imsld.lt_Some_warnings_has_bee#</b></p>
     <ul>
     @warnings;noquote@
     </ul>
 </if>
 
 <if @error_flag@ not nil>
-<p><b>Some errors has been found</b></p>
+<p><b>#imsld.lt_Some_errors_has_been_#</b></p>
     <ul>@errors;noquote@</ul>
-    <a href="@back@">Go back</a>
+    <a href="@back@">#imsld.Go_back#</a>
     </if>
 <else>
 
 <hr>
-<p>Are all the students asigned to the proper roles? If you confirm now, no more changes will be acepted later.</p>
+<p>#imsld.lt_Are_all_the_students_#</p>
 
-<p>If you are not sure that everything is OK, please <a href="@back@">go back</a></p>
-<p>Otherwise, if everthing is OK and you are sure, please <a href="@confirm@">Confirm</a>.</p>
+<p>#imsld.lt_If_you_are_not_sure_t# <a href="@back@">#imsld.go_back#</a></p>
+<p>#imsld.lt_Otherwise_if_everthin# <a href="@confirm@">#imsld.Confirm#</a>.</p>
 </else>
 
 
+
Index: openacs-4/packages/imsld/www/admin/imsld-new-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/imsld-new-2.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/imsld/www/admin/imsld-new-2.adp	25 Nov 2005 12:11:36 -0000	1.4
+++ openacs-4/packages/imsld/www/admin/imsld-new-2.adp	21 Dec 2006 15:20:47 -0000	1.5
@@ -1,5 +1,5 @@
 <master>
-  <property name="title">titulin</property>
-  <property name="context">contextin</property>
+  <property name="title">@page_title@</property>
+  <property name="context">@context@</property>
 
 @warnings;noquote@
Index: openacs-4/packages/imsld/www/admin/imsld-role-members.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/imsld-role-members.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/imsld/www/admin/imsld-role-members.adp	21 Jul 2006 13:12:10 -0000	1.3
+++ openacs-4/packages/imsld/www/admin/imsld-role-members.adp	21 Dec 2006 15:20:47 -0000	1.4
@@ -3,23 +3,24 @@
   <td><h1>@group_title@</h1></td>
   <td>
     <ul>
-        <li>Max. number of students per group: @max_persons@</li>
-        <li>Min. number of students per group: @min_persons@</li>
+        <li>#imsld.lt_Max_number_of_student#</li>
+        <li>#imsld.lt_Min_number_of_student#</li>
     </ul>
   </td>
 </tr>
 
 <tr>
   <td>
-<h2>Not members</h2>
+<h2>#imsld.Not_members#</h2>
 <listtemplate name="asign_not_members"></listtemplate>
   </td>
   <td>
-<h2>Group members</h2>
+<h2>#imsld.Group_members#</h2>
  <listtemplate name="asign_members"></listtemplate> 
   </td>
   <td>
   <formtemplate id="confirm"></formtemplate> <br>
   </td>
 </tr>
 
+
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/imsld/www/admin/imsld-view-roles.adp.orig'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/imsld/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/index.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/imsld/www/admin/index.tcl	19 Sep 2006 11:02:01 -0000	1.12
+++ openacs-4/packages/imsld/www/admin/index.tcl	21 Dec 2006 15:20:47 -0000	1.13
@@ -146,7 +146,7 @@
             set image_alt "[_ imsld.active]"
             set image_title "[_ imsld.active]"
             set image_path "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]/resources/active.png"
-            set manage "<a href=\"[export_vars -base "imsld-view-roles" { run_id }]\">[_ imsld.View_members]</a>" 
+            set manage "<a href=\"[export_vars -base "imsld-view-roles" { run_id }]\">[_ imsld.View_members]</a> | <a href=\"[export_vars -base "monitor/" { run_id }]\">[_ imsld.Monitor]</a>" 
         }
         waiting {
             set image_alt "[_ imsld.waiting]"
@@ -159,7 +159,7 @@
             set image_alt "[_ imsld.stopped]"
             set image_title "[_ imsld.stopped]"
             set image_path "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]/resources/completed.png"
-            set manage "<a href=\"[export_vars -base "imsld-view-roles" { run_id }]\">[_ imsld.View_members]</a>" 
+            set manage "<a href=\"[export_vars -base "imsld-view-roles" { run_id }]\">[_ imsld.View_members]</a> | <a href=\"[export_vars -base "monitor/" { run_id }]\">[_ imsld.Monitor]</a>" 
         }
     }    
 }
Index: openacs-4/packages/imsld/www/admin/monitor/activity-frame.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/monitor/activity-frame.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/imsld/www/admin/monitor/activity-frame.adp	21 Dec 2006 15:20:47 -0000	1.1
@@ -0,0 +1,39 @@
+<master>
+  <property name="title">@page_title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+
+<span id="addc1" style="position:absolute;top:0px;left:0px;">
+<a href="#" onClick="return _tp(false)" title="Hide panel" class="show-hide-icon_link"><img src="/resources/acs-subsite/stock_left.png" alt="Hide" border="0" align="top"/></a>
+</span>
+<span id="addc" style="display:none;position:absolute;top:0px;left:0px;">
+<a href="#" onClick="return _tp(true)" title="Show panel" class="show-hide-icon_link"><img src="/resources/acs-subsite/stock_right.png" alt="Show" border="0" align="top"/></a>
+</span>
+
+@list_header@
+<br /><br />
+<listtemplate name="related_users"></listtemplate>
+<br />
+
+<script type="text/javascript">
+function _tp(a){
+   var ab=document.getElementById("addc");
+   var ac=document.getElementById("addc1");
+
+   if (a) {
+     ai=''; 
+     aj='none';
+     parent.document.getElementsByTagName("frameset")[1].cols='30%,*';
+   } else {
+     ai='none';
+     aj='';
+     parent.document.getElementsByTagName("frameset")[1].cols='0%,*';
+   }
+
+   ac.style.display=ai;
+   ab.style.display=aj;
+   
+   return false;
+}
+
+
+</script>
Index: openacs-4/packages/imsld/www/admin/monitor/activity-frame.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/monitor/activity-frame.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/imsld/www/admin/monitor/activity-frame.tcl	21 Dec 2006 15:20:47 -0000	1.1
@@ -0,0 +1,295 @@
+# packages/imsld/www/admin/monitor/activity-frame.tcl
+
+ad_page_contract {
+
+    Page used to display the associated info of a given acitvity
+
+    @author jopez@inv.it.uc3m.es
+    @creation-date Nov 2006
+} -query {
+    run_id:integer,notnull
+    {activity_id:integer ""}
+    {learning_object_id:integer ""}
+    {service_id:integer ""}
+    type:notnull
+} -validate {
+    non_empty_id {
+        if { [string eq "" $activity_id] && [string eq "" $learning_object_id] && [string eq "" $service_id] } {
+            ad_complain "[_ imsld.lt_You_must_provide_an_a]"
+        }
+    }
+}
+
+set page_title "[_ imsld.lt_Monitoring_One_Activi]"
+set context [list]
+
+set elements [list user_name \
+                  [list label "[_ imsld.Name]" \
+                       display_template {<a href="individual-report-frame?run_id=${run_id}&member_id=@related_users.user_id@">@related_users.user_name@</a>}] \
+                  email \
+                  [list label "[_ imsld.Email]"]]
+
+if { [string eq $type "learning"] || [string eq $type "support"] || [string eq $type "structure"] } {
+    # status directly recorded in the status table, get the info
+    set list_header "[_ imsld.lt_Users_who_have_starte]"
+    template::multirow create related_users user_id user_name email role start_date finish_date
+    lappend elements start_date \
+        [list label "[_ imsld.Start_Date]"]
+    lappend elements finish_date \
+        [list label "[_ imsld.Finish_Date]"]
+
+    set users_list [list]
+    db_foreach related_user {
+        select stat.user_id,
+        stat.role_id,
+        stat.status,
+        to_char(stat.status_date,'MM/DD/YYYY HH24:MI:SS') as status_date,
+        persons.last_name||', '||persons.first_names as user_name,
+        parties.email
+        from imsld_status_user stat,
+        persons,
+        parties
+        where stat.user_id = persons.person_id
+        and persons.person_id = parties.party_id
+        and stat.run_id = :run_id
+        and related_id = :activity_id
+        order by user_id, status desc
+    } {
+        if { [lsearch -regexp $users_list $user_id] != -1 } {
+            # the elemen exists, replace the list element
+            switch $status {
+                started {
+                    set users_list [lreplace $users_list [lsearch -regexp $users_list $user_id] [lsearch -regexp $users_list $user_id] \
+                                        [list $user_id \
+                                             $user_name \
+                                             $email \
+                                             $role_id \
+                                             $status_date \
+                                             [lindex [lindex $users_list [lsearch -regexp $users_list $user_id]] 5]]]
+                }
+                finished {
+                    set users_list [lreplace $users_list [lsearch -regexp $users_list $user_id] [lsearch -regexp $users_list $user_id] \
+                                        [list $user_id \
+                                             $user_name \
+                                             $email \
+                                             $role_id \
+                                             [lindex [lindex $users_list [lsearch -regexp $users_list $user_id]] 4] \
+                                             $status_date]]
+                }
+            } 
+        } else {
+            # just insert the element in the list
+            switch $status {
+                started {
+                    lappend users_list \
+                        [list $user_id \
+                             $user_name \
+                             $email \
+                             $role_id \
+                             $status_date \
+                             {}]
+                }
+                finished {
+                    lappend users_list \
+                        [list $user_id \
+                             $user_name \
+                             $email \
+                             $role_id \
+                             {} \
+                             $status_date]
+                }
+            } 
+        }
+    }
+    foreach user $users_list {
+        template::multirow append related_users [lindex $user 0] [lindex $user 1] [lindex $user 2] [lindex $user 3] [lindex $user 4] [lindex $user 5]
+    }
+    
+} elseif { [string eq $type "learning_object"] } {
+    # the environment has been viwed (finished) if the user have seen the referenced resources
+    set list_header "[_ imsld.lt_Users_who_have_bviewe]"
+    template::multirow create related_users user_name email user_id
+
+    db_1row lo_info {
+        select item_id as learning_object_item_id,
+        environment_id as environment_item_id
+        from imsld_learning_objectsi
+        where learning_object_id = :learning_object_id
+    }
+
+    set item_list [db_list item_linear_list {
+        select ii.imsld_item_id
+        from imsld_items ii,
+        cr_items cr,
+        acs_rels ar
+        where ar.object_id_one = :learning_object_item_id
+        and ar.object_id_two = cr.item_id
+        and cr.live_revision = ii.imsld_item_id}]
+    
+    foreach imsld_item_id $item_list {
+        lappend related_resources [db_list resources_list {
+            select cpr.resource_id
+            from imsld_cp_resources cpr, imsld_items ii,
+            acs_rels ar, cr_items cr1, cr_items cr2
+            where ar.object_id_one = cr1.item_id
+            and ar.object_id_two = cr2.item_id
+            and cr1.live_revision = ii.imsld_item_id
+            and cr2.live_revision = cpr.resource_id 
+            and (imsld_tree_sortkey between tree_left((select imsld_tree_sortkey from imsld_items where imsld_item_id = :imsld_item_id))
+                 and tree_right((select imsld_tree_sortkey from imsld_items where imsld_item_id = :imsld_item_id))
+                 or ii.imsld_item_id = :imsld_item_id)}]
+    }
+
+    # now that we have all the referenced resources in the learning object, get the users who have viwed them all
+    foreach user_id [db_list get_visitors "
+                select user_id
+                from imsld_status_user
+                where related_id in ([join $related_resources ","])
+                and status = 'finished'
+                and run_id = :run_id
+                group by user_id
+                having count(*) = [llength $related_resources]
+            "] {
+        template::multirow append related_users [person::name -person_id $user_id] [party::email -party_id $user_id] $user_id
+    }
+
+} elseif { [string eq $type "service"] } {
+    # currently, we support there are three types of services: 1. conference, 2. monitory and 3. send-mail
+    # the first two types have resources associated whereas the last one doesn't and has to be treated as a separate case
+
+    set list_header "[_ imsld.lt_Users_who_have_bat_le]"
+
+    template::multirow create related_users user_name email user_id
+
+    db_1row service_info {
+        select service_type,
+        environment_id as environment_item_id,
+        item_id as service_item_id
+        from imsld_servicesi
+        where service_id = :service_id
+    }
+    
+    switch $service_type {
+        conference {
+            append list_header "[_ imsld.conference]"
+            db_1row conference_info {
+                select conf.conference_id,
+                conf.conference_type,
+                conf.imsld_item_id as imsld_item_item_id,
+                cr.live_revision as imsld_item_id, 
+                conf.title as conf_title
+                from imsld_conference_servicesi conf, cr_items cr
+                where conf.service_id = :service_item_id
+                and cr.item_id = conf.imsld_item_id
+                and content_revision__is_live(cr.live_revision) = 't'
+            }
+
+            set related_resources [db_list conf_resources_list {
+                select cpr.resource_id
+                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 (imsld_tree_sortkey between tree_left((select imsld_tree_sortkey from imsld_items where imsld_item_id = :imsld_item_id))
+                     and tree_right((select imsld_tree_sortkey from imsld_items where imsld_item_id = :imsld_item_id))
+                     or ii.imsld_item_id = :imsld_item_id)
+            }]
+
+            foreach user_id [db_list get_visitors "
+                select user_id
+                from imsld_status_user
+                where related_id in ([join $related_resources ","])
+                and status = 'finished'
+                and run_id = :run_id
+                group by user_id
+                having count(*) = [llength $related_resources]
+            "] {
+                template::multirow append related_users [person::name -person_id $user_id] [party::email -party_id $user_id] $user_id
+            }            
+        } monitor {
+            append list_header "[_ imsld.monitor]"
+            db_1row monitor_info {
+                select ims.title as monitor_service_title,
+                ims.monitor_id,
+                ims.item_id as monitor_item_id,
+                ims.self_p,
+                ims.role_id,
+                cr.live_revision as imsld_item_id
+                from imsld_monitor_servicesi ims, cr_items cr
+                where ims.service_id = :service_item_id
+                and cr.item_id = ims.imsld_item_id
+                and content_revision__is_live(cr.live_revision) = 't'
+            }
+            
+            set related_resources [db_list conf_resources_list {
+                select cpr.resource_id
+                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 (imsld_tree_sortkey between tree_left((select imsld_tree_sortkey from imsld_items where imsld_item_id = :imsld_item_id))
+                     and tree_right((select imsld_tree_sortkey from imsld_items where imsld_item_id = :imsld_item_id))
+                     or ii.imsld_item_id = :imsld_item_id)
+            }]
+
+            foreach user_id [db_list get_visitors "
+                select user_id
+                from imsld_status_user
+                where related_id in ([join $related_resources ","])
+                and status = 'finished'
+                and run_id = :run_id
+                group by user_id
+                having count(*) = [llength $related_resources]
+            "] {
+                template::multirow append related_users [person::name -person_id $user_id] [party::email -party_id $user_id] $user_id
+            }
+
+        } send-mail {
+            # 1. get the users associated to the run
+            # 2. get the users IN the run who have sent a bulk-mail message
+            append list_header "[_ imsld.sendmail]"
+
+            append list_header "<br />[_ imsld.lt_This_is_a_special_cas]"
+            
+            db_foreach user_in_run {
+                select gmm.member_id,
+                ir.creation_date as run_creation_date
+                from group_member_map gmm,
+                imsld_run_users_group_ext iruge, 
+                acs_rels ar1,
+                imsld_runs ir
+                where iruge.run_id=:run_id
+                and iruge.run_id = ir.run_id
+                and ar1.object_id_two=iruge.group_id 
+                and ar1.object_id_one=gmm.group_id 
+                order by member_id
+            } {
+                # NOTE: The bulk mail package has a bug when storing the send_date (it's stored in YYYY-MM-DD format, withot the hour)
+                #       that's  why we have to do a little trick with the dates when comparing them, even though it's not 100% accurate
+                if { [db_string user_sent_bulk_mail_p {
+                    select count(*)
+                    from acs_objects ao,
+                    bulk_mail_messages bm
+                    where ao.object_id = bm.bulk_mail_id
+                    and creation_user = :member_id
+                    and to_date(send_date,'YYYY-MM-DD') >= to_date(:run_creation_date,'YYYY-MM-DD')
+                }] > 0 } {
+                    template::multirow append related_users [person::name -person_id $member_id] [party::email -party_id $member_id] $member_id
+                }
+            }
+        }
+    }
+
+}
+
+template::list::create \
+    -name related_users \
+    -multirow related_users \
+    -key user_id \
+    -no_data "[_ imsld.No_info_was_found]" \
+    -elements $elements \
+    -filters { activity_id {} run_id {} type {} }
+
+
Index: openacs-4/packages/imsld/www/admin/monitor/environment-frame.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/monitor/environment-frame.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/imsld/www/admin/monitor/environment-frame.adp	21 Dec 2006 15:20:47 -0000	1.1
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <script src="/resources/acs-templating/mktree.js" language="javascript"></script>
+    <link rel="stylesheet" href="/resources/acs-templating/mktree.css" media="all">
+<style type="text/css">
+ul {
+font-family: Verdana, Arial, Helvetica, sans-serif;
+font-size: 12px;
+font-style: normal;
+font-weight: normal;
+font-variant: normal;
+text-decoration: none;
+text-transform: none;
+text-indent: 0px;
+padding: 0px;
+margin: 0px;
+}
+</style>
+</head>
+<body>
+
+@environments;noquote@
+
+</body>
+
+<script type="text/javascript">
+var as = document.getElementsByTagName("a");
+for (var i = 0; i < as.length; i++) {
+  var a = as[i];
+  a.setAttribute('target', 'content');
+}
+</script>
+
+</html>
Index: openacs-4/packages/imsld/www/admin/monitor/environment-frame.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/monitor/environment-frame.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/imsld/www/admin/monitor/environment-frame.tcl	21 Dec 2006 15:20:47 -0000	1.1
@@ -0,0 +1,44 @@
+ad_page_contract {
+
+    This is the frame that contains the associated URLs of an environment
+
+    @author Eduardo P�rez Ureta <eduardo.perez@uc3m.es>
+    @creation-date 2006-03-03
+} -query {
+    activity_id:integer,notnull
+    run_id:integer,notnull
+}
+
+dom createDocument ul doc
+set dom_root [$doc documentElement]
+
+#set environments_node_ul [$doc createElement ul]
+set environments_node_li [$doc createElement li]
+set text [$doc createTextNode "[_ imsld.Context_info]"]
+$environments_node_li appendChild $text
+set environments_node [$doc createElement ul]
+$environments_node setAttribute class "mktree"
+$environments_node setAttribute style "white-space: nowrap;"
+
+# FIX-ME: if the ul is empty, the browser shows the ul incorrectly   
+set text [$doc createTextNode ""]
+$environments_node appendChild $text
+
+set activity_item_id [content::revision::item_id -revision_id $activity_id]
+
+imsld::monitor::activity_environments_tree -activity_item_id $activity_item_id \
+    -run_id $run_id \
+    -dom_node $environments_node \
+    -dom_doc $doc
+$dom_root appendChild $environments_node_li
+
+set environments_node_li [$doc createElement li]
+$environments_node_li setAttribute class "liOpen"
+
+$environments_node_li appendChild $environments_node
+$dom_root appendChild $environments_node_li
+
+set environments [$dom_root asXML]   
+
+set page_title {}
+set context [list]
Index: openacs-4/packages/imsld/www/admin/monitor/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/monitor/index.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/imsld/www/admin/monitor/index.adp	21 Dec 2006 15:20:47 -0000	1.1
@@ -0,0 +1,17 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"
+   "http://www.w3.org/TR/html4/frameset.dtd">
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <title>@course_name@</title>
+</head>
+<frameset rows="%30,*">
+  <frame src="run-info?run_id=@run_id@" name="run-info">
+  <frameset cols="30%,*">
+    <frameset rows="60%,*">
+    <frame src="monitor-tree?run_id=@run_id@" name="toc">
+      <frame src="" name="environment">
+    </frameset>  
+    <frame src="" name="content">
+  </frameset>
+</html>
Index: openacs-4/packages/imsld/www/admin/monitor/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/monitor/index.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/imsld/www/admin/monitor/index.tcl	21 Dec 2006 15:20:47 -0000	1.1
@@ -0,0 +1,17 @@
+# packages/imsld/www/admin/monitor/index.tcl
+
+ad_page_contract {
+    
+    Display all tha activities for monitoring purposes
+
+    @author jopez@inv.it.uc3m.es
+    @creation-date Nov 06
+    @cvs-id $Id: index.tcl,v 1.1 2006/12/21 15:20:47 josee Exp $
+} {
+    run_id:integer,notnull
+} -properties {
+} -validate {
+} -errors {
+}
+
+set course_name ""
Index: openacs-4/packages/imsld/www/admin/monitor/individual-report-frame.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/monitor/individual-report-frame.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/imsld/www/admin/monitor/individual-report-frame.adp	21 Dec 2006 15:20:47 -0000	1.1
@@ -0,0 +1,40 @@
+<master>
+  <property name="title">@page_title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+
+<span id="addc1" style="position:absolute;top:0px;left:0px;">
+<a href="#" onClick="return _tp(false)" title="Hide panel" class="show-hide-icon_link"><img src="/resources/acs-subsite/stock_left.png" alt="Hide" border="0" align="top"/></a>
+</span>
+<span id="addc" style="display:none;position:absolute;top:0px;left:0px;">
+<a href="#" onClick="return _tp(true)" title="Show panel" class="show-hide-icon_link"><img src="/resources/acs-subsite/stock_right.png" alt="Show" border="0" align="top"/></a>
+</span>
+
+#imsld.This#
+
+<br /><br />
+
+<listtemplate name="activities"></listtemplate>
+
+<script type="text/javascript">
+function _tp(a){
+   var ab=document.getElementById("addc");
+   var ac=document.getElementById("addc1");
+
+   if (a) {
+     ai=''; 
+     aj='none';
+     parent.document.getElementsByTagName("frameset")[1].cols='30%,*';
+   } else {
+     ai='none';
+     aj='';
+     parent.document.getElementsByTagName("frameset")[1].cols='0%,*';
+   }
+
+   ac.style.display=ai;
+   ab.style.display=aj;
+   
+   return false;
+}
+
+
+</script>
Index: openacs-4/packages/imsld/www/admin/monitor/individual-report-frame.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/monitor/individual-report-frame.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/imsld/www/admin/monitor/individual-report-frame.tcl	21 Dec 2006 15:20:47 -0000	1.1
@@ -0,0 +1,96 @@
+# packages/imsld/www/admin/monitor/individual-report-frame.tcl
+
+ad_page_contract {
+
+    Page used to display the individual report of a given user in the run
+
+    @author jopez@inv.it.uc3m.es
+    @creation-date Dic 2006
+} -query {
+    run_id:integer,notnull
+    member_id:integer,notnull
+}
+
+set page_title "[_ imsld.Individual_Report]"
+set context [list]
+set member_name [party::name -party_id $member_id]
+
+set elements [list user_name \
+                  [list label "[_ imsld.Activity_Name]" \
+                       display_template {<a href="activity-frame?run_id=$run_id&type=@related_activities.type@&activity_id=@related_activities.related_id@">@related_activities.activity_name@</a>}] \
+                  type \
+                  [list label "[_ imsld.Activity_Type]"] \
+                  started_time \
+                  [list label "[_ imsld.Started_Date]"] \
+                  finished_time \
+                  [list label "[_ imsld.Finished_Date]"]]
+
+template::multirow create related_activities related_id activity_name type started_time finished_time
+set activities_list [list]
+        
+db_foreach related_resources {
+    select stat.related_id,
+    stat.role_id,
+    stat.status,
+    stat.type,
+    to_char(stat.status_date,'MM/DD/YYYY HH24:MI:SS') as status_date
+    from imsld_status_user stat
+    where stat.user_id = :member_id
+    and stat.run_id = :run_id
+    and type in ('learning','support','structure')
+    order by related_id, status desc
+} {
+    if { [lsearch -regexp $activities_list $related_id] != -1 } {
+        # the elemen exists, replace the list element
+        switch $status {
+            started {
+                set activities_list [lreplace $activities_list [lsearch -regexp $activities_list $related_id] [lsearch -regexp $activities_list $related_id] \
+                                         [list $related_id \
+                                              [content::item::get_title -item_id [content::revision::item_id -revision_id $related_id]] \
+                                              $type \
+                                              $status_date \
+                                              [lindex [lindex $activities_list [lsearch -regexp $activities_list $related_id]] 4]]]
+            }
+            finished {
+                set activities_list [lreplace $activities_list [lsearch -regexp $activities_list $related_id] [lsearch -regexp $activities_list $related_id] \
+                                         [list $related_id \
+                                              [content::item::get_title -item_id [content::revision::item_id -revision_id $related_id]] \
+                                              $type \
+                                              [lindex [lindex $activities_list [lsearch -regexp $activities_list $related_id]] 3] \
+                                              $status_date]]
+            }
+        } 
+    } else {
+        # just insert the element in the list
+        switch $status {
+            started {
+                lappend activities_list \
+                    [list $related_id \
+                         [content::item::get_title -item_id [content::revision::item_id -revision_id $related_id]] \
+                         $type \
+                         $status_date \
+                         {}]
+            }
+            finished {
+                lappend activities_list \
+                    [list $related_id \
+                         [content::item::get_title -item_id [content::revision::item_id -revision_id $related_id]] \
+                         $type \
+                         {} \
+                         $status_date]
+            }
+        } 
+    }
+}
+
+set activities_list [lsort -index 1 $activities_list]
+foreach activity $activities_list {
+    template::multirow append related_activities [lindex $activity 0] [lindex $activity 1] [lindex $activity 2] [lindex $activity 3] [lindex $activity 4]
+}
+
+template::list::create \
+    -name activities \
+    -multirow related_activities \
+    -key related_id \
+    -no_data "[_ imsld.No_info_was_found]" \
+    -elements $elements
\ No newline at end of file
Index: openacs-4/packages/imsld/www/admin/monitor/monitor-tree.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/monitor/monitor-tree.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/imsld/www/admin/monitor/monitor-tree.adp	21 Dec 2006 15:20:47 -0000	1.1
@@ -0,0 +1,73 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <script src="/resources/acs-templating/mktree.js" language="javascript"></script>
+    <link rel="stylesheet" href="/resources/acs-templating/mktree.css" media="all">
+
+<SCRIPT>
+    function confirmValue(myform){
+        myform.submit()
+    }
+</SCRIPT>
+
+<style type="text/css">
+ul {
+font-family: Verdana, Arial, Helvetica, sans-serif;
+font-size: 12px;
+font-style: normal;
+font-weight: normal;
+font-variant: normal;
+text-decoration: none;
+text-transform: none;
+text-indent: -15px;
+padding: 15px 0px 0px 0px;
+margin: 0px;
+}
+div {
+    text-align: right;
+    font-size: 80%;
+} 
+a.button  {
+	text-align: center;
+	border: 3px outset #00b;
+	background-color: #007; 
+	color: #fff;
+	font-weight: bold;
+	font-size: 10px;
+	text-decoration: none;
+	padding: 0px;      
+	margin: 0px;
+    top: 0px;
+    left: 0px;
+}
+a.button:hover  {
+	color: #fff;
+	background-color: #00d;
+	border: 3px inset #00b;
+}
+
+</style>
+</head>
+<body>
+<a href="@imsld_admin_url@"  style="display: block; position: fixed;" class="button" target="_top">#imsld.Exit#</a>
+@html_tree;noquote@
+@aux_html_tree;noquote@
+</body>
+
+<script type="text/javascript">
+var as = document.getElementsByTagName("a");
+for (var i = 0; i < as.length; i++) {
+  var a = as[i];
+  for( var x = 0; x < a.attributes.length; x++ ) {
+    if( a.attributes[x].nodeName.toLowerCase() == 'href' ) {
+      if ( a.attributes[x].nodeValue.match(/activity-frame/) ) {
+        var enviromenturl = a.attributes[x].nodeValue.replace(/activity-frame/, "environment-frame");
+        a.setAttribute('onClick',"parent.environment.location='" + enviromenturl + "'");
+      }
+    }
+  }
+}
+</script>
+
+</html>
Index: openacs-4/packages/imsld/www/admin/monitor/monitor-tree.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/monitor/monitor-tree.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/imsld/www/admin/monitor/monitor-tree.tcl	21 Dec 2006 15:20:47 -0000	1.1
@@ -0,0 +1,76 @@
+ad_page_contract {
+    @author jopez@inv.it.uc3m.es
+    @creation-date Nov 2006
+} {
+    run_id:integer,notnull
+}
+
+# initialize variables
+set page_title "[_ imsld.units-of-learning]"
+set context ""
+set community_id [dotlrn_community::get_community_id]
+set cr_root_folder_id [imsld::cr::get_root_folder -community_id $community_id]
+set user_id [ad_conn user_id]
+set imsld_package_id [site_node_apm_integration::get_child_package_id \
+                          -package_id [dotlrn_community::get_package_id $community_id] \
+                          -package_key "[imsld::package_key]"]
+
+set imsld_admin_url [export_vars -base "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]admin/"]
+
+db_1row imslds_info {
+    select imsld.item_id as imsld_item_id,
+    imsld.imsld_id,
+    coalesce(imsld.title, imsld.identifier) as imsld_title
+    from imsld_imsldsi imsld, imsld_runs run
+    where imsld.imsld_id = run.imsld_id
+    and run.run_id = :run_id
+} 
+
+dom createDocument ul doc
+set dom_root [$doc documentElement]
+$dom_root setAttribute class "mktree"
+$dom_root setAttribute style "white-space: nowrap;"
+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]
+
+imsld::monitor::activities_tree -run_id $run_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 run_id = :run_id
+} -default 0] > 0 } {
+    dom createDocument ul aux_doc
+    set aux_dom_root [$aux_doc documentElement]
+    $aux_dom_root setAttribute class "mktree"
+    $aux_dom_root setAttribute style "white-space: nowrap;"
+    set aux_title_node [$aux_doc createElement li]
+    $aux_title_node setAttribute class "liOpen"
+    set text [$doc createTextNode "[_ imsld.Extra_Activities]"] 
+    $aux_title_node appendChild $text
+    $aux_dom_root appendChild $aux_title_node
+    
+    set aux_activities_node [$aux_doc createElement ul]
+    imsld::monitor::runtime_assigned_activities_tree -run_id $run_id \
+        -dom_node $aux_activities_node \
+        -dom_doc $aux_doc
+    
+    $aux_title_node appendChild $aux_activities_node
+    
+    set aux_html_tree [$aux_dom_root asXML]
+} else {
+    set aux_html_tree ""
+}
+
Index: openacs-4/packages/imsld/www/admin/monitor/run-info.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/monitor/run-info.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/imsld/www/admin/monitor/run-info.adp	21 Dec 2006 15:20:47 -0000	1.1
@@ -0,0 +1,29 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <script src="/resources/acs-templating/mktree.js" language="javascript"></script>
+    <link rel="stylesheet" href="/resources/acs-templating/mktree.css" media="all">
+<style type="text/css">
+p {
+font: 10pt/22pt; 
+font-family:Verdana, Arial, Helvetica, sans-serif;
+text-align:center;  
+font-size: 11px;
+color: #ffffff;
+margin: 0px;
+padding: 0px 0px 0px 0px;
+}
+body {
+margin: 0px;
+padding: 0px 0px 0px 0px;
+top: 0px;
+background-color: #7697B9;
+}
+</style>
+</head>
+<body>
+<p>#imsld.Runinfo_Name# <i>@imsld_title@</i> #imsld._Assigned_users# <i>@number_of_members@</i> #imsld._Creation_Date# <i>@creation_date@</i> #imsld._Status_The_run_is# <i><b>@status@</b></i> #imsld.since# <i>@status_date@</i></p>
+</body>
+</html>
+
Index: openacs-4/packages/imsld/www/admin/monitor/run-info.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/admin/monitor/run-info.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/imsld/www/admin/monitor/run-info.tcl	21 Dec 2006 15:20:47 -0000	1.1
@@ -0,0 +1,36 @@
+# packages/imsld/www/admin/monitor/run-info.tcl
+
+ad_page_contract {
+    
+    Displays the run info
+
+    @author jopez@inv.it.uc3m.es
+    @creation-date Dic 06
+    @cvs-id $Id: run-info.tcl,v 1.1 2006/12/21 15:20:47 josee Exp $
+} {
+    run_id:integer,notnull
+} -properties {
+} -validate {
+} -errors {
+}
+
+db_1row context_info {
+    select ir.status,
+    to_char(ir.creation_date,'DAY, DD MON YYYY') as creation_date,
+    to_char(ir.status_date,'YYYY-MM-DD HH24:MM') as status_date,
+    content_item__get_title(ii.item_id) as imsld_title
+    from imsld_runs ir, imsld_imsldsi ii
+    where ir.run_id = :run_id
+    and ir.imsld_id = ii.imsld_id
+}
+
+
+db_1row get_users_in_run {
+    select count(distinct(gmm.member_id)) as number_of_members
+    from group_member_map gmm,
+    imsld_run_users_group_ext iruge, 
+    acs_rels ar1 
+    where iruge.run_id=:run_id
+    and ar1.object_id_two=iruge.group_id 
+    and ar1.object_id_one=gmm.group_id 
+}
\ No newline at end of file