Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/cards/www/card.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/cards/www/card.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/cards/www/card.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/cards/www/cards.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/cards/www/cards.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/cards/www/cards_list-chunk-table.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/cards/www/cards_list-chunk-table.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/cards/www/cards_list-chunk-table.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/cards/www/cards_list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/cards_list.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/cards_list.adp	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,81 @@
+<MASTER>
+<link rel="stylesheet" href="cards.css" type="text/css">
+
+<DIV id="all" class="all">
+<!-- CABECERA -->
+        <div class="comm">@community_name@</div>
+        <div class="back">
+                <A HREF="../one-community" class="back">#cards.card_Back#</A>
+        </div>
+
+<div class="spacer">&nbsp;</div>
+
+<!-- MENU DE OPCIONES  -->
+
+        <A HREF="manage_blocks" class="button_item" title="#cards.tooltip_Setup_evaluation#">#cards.card_Setup_evaluation#</A>
+        <A HREF="manage_tasks" class="button_item" title="#cards.tooltip_Manage_notes#">#cards.card_Manage_notes#</A>
+        <A HREF="eval2cards" class="button_item"  title="#cards.tooltip_Eval2task#">#cards.import_grades#</A>
+    <A HREF="grades_list" class="button_item" title="#cards.tooltip_List_grades#">#cards.card_Grades_list#</A>
+        <A HREF="list-photos" class="button_item" title="#cards.tooltip_List_photos#">#cards.card_Orla#</A>
+<div class="spacer">&nbsp;</div>
+
+<!--  LLISTA D'ALUMNES EN CSV -->
+<if @mode@ eq "csv">
+<listtemplate name="csv_members"></listtemplate>
+</if>
+
+<!-- CAP�ALERA LLISTAT ALUMNES -->
+<table class="uv_list" summary="#cards.summary_List_alum#">
+<CAPTION class="uv_list">#cards.card_Student_records#</CAPTION>
+  <tr class="uv_list_header">
+    <th class="uv_list">&nbsp;</th>
+    <th class="uv_list">#dotlrn.Last_Name#&nbsp;&nbsp;
+                <A HREF="cards_list?order=last_name&order_dir=asc" class="noline">
+                        <IMG SRC="icons/up.gif" alt="#cards.tooltip_orderby_asc#"></A>
+                <A HREF="cards_list?order=last_name&order_dir=desc" class="noline">
+                        <IMG SRC="icons/down.gif" alt="#cards.tooltip_orderby_desc#"></A>               
+        </th>
+        <th class="uv_list">#dotlrn.First_Name#&nbsp;&nbsp;
+                <A HREF="cards_list?order=first_names&order_dir=asc" class="noline">
+                        <IMG SRC="icons/up.gif" alt="#cards.tooltip_orderby_asc#"></A>
+                <A HREF="cards_list?order=first_names&order_dir=desc" class="noline">
+                        <IMG SRC="icons/down.gif" alt="#cards.tooltip_orderby_desc#"></A>
+        </th>
+        <th class="uv_list">#dotlrn.Email#&nbsp;&nbsp;
+                <A HREF="cards_list?order=email&order_dir=asc" class="noline">
+                        <IMG SRC="icons/up.gif" alt="#cards.tooltip_orderby_asc#"></A>
+                <A HREF="cards_list?order=email&order_dir=desc" class="noline">
+                        <IMG SRC="icons/down.gif" alt="#cards.tooltip_orderby_desc#"></A>       
+        </th>
+  </tr>
+
+<!-- LLISTAT D'ALUMNES -->
+<multiple name="current_members">
+  <if @current_members.rownum@ odd>
+    <tr class="list-odd" onmouseover="javascript:style.backgroundColor='#99ccff'" onmouseout="javascript:style.backgroundColor='#EAF2FF'">
+  </if><else>
+    <tr class="list-even" onmouseover="javascript:style.backgroundColor='#99ccff'" onmouseout="javascript:style.backgroundColor='#FFFFFF'">
+  </else>
+    <td class="uv_list"><B>@current_members.rownum@</B></td>
+    <td class="uv_list">
+                <A HREF="student_notes?user_id=@current_members.user_id@" class="alum">
+                        @current_members.last_name@</A></td>
+    <td class="uv_list">
+                <A HREF="student_notes?user_id=@current_members.user_id@" class="alum">
+                        @current_members.first_names@</A>       
+        </td>
+    <td class="uv_list">
+                <A HREF="student_notes?user_id=@current_members.user_id@" class="alum">
+                        @current_members.email@</A>       
+        </td>  
+  </tr>
+</multiple>
+</table><BR>
+<%= @current_members:rowcount@ %> #dotlrn.student_role_pretty_plural#<BR>
+<A HREF="cards_list?mode=csv" class="csv">#cards.generate_csv#</A>
+
+</div>
+<!--<P>Numero de cards creadas: @num_cards_created 
+<P>N�mero de notas/tareas de la comunidad: @num_notes_created -->
+
+
Index: openacs-4/packages/cards/www/cards_list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/cards_list.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/cards_list.tcl	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,149 @@
+ad_page_contract {
+}  -query {
+  {order:optional last_name}
+  {order_dir:optional asc}
+  {mode:optional ""}
+} -properties {
+}
+
+set dotlrn_url [dotlrn::get_url]
+set my_user_id [ad_conn user_id]
+set referer [ns_conn url]
+
+
+# Check if we are in a subcommunity. In this case, we use the big parent community cards
+# but only show the user cards that are in subgroup
+
+# Community and big parent community
+set community_selected [dotlrn_community::get_community_id]
+set community_name [cards::get_community_pretty_name -community_id $community_selected]
+set parent_community_id [cards::get_big_parent_community -community_id $community_selected]
+set reuse_parent_cards [cards::get_community_parameter -community_id $community_selected -param "ReuseParentCards"]
+
+if {$community_selected == $parent_community_id} {
+        set subgroup 0
+        set community_id $community_selected
+} else {
+        set subgroup 1
+        set community_id $community_selected
+        # If we reuse the cards we have to do the next actions, otherwise notihing to do
+        if {$reuse_parent_cards eq 1} {
+                set community_id $parent_community_id
+                set community_name [cards::get_community_pretty_name -community_id $community_id]
+                append  community_name " :: " [cards::get_community_pretty_name -community_id $community_selected]
+        }
+}
+
+
+
+#set community_id [dotlrn_community::get_community_id]
+#set community_selected $community_id
+#set community_id [cards::get_big_parent_community -community_id $community_id]
+#if {$community_selected ne $community_id} {
+#       append community_name [cards::get_community_pretty_name -community_id $community_id] \
+#       " :: " [cards::get_community_pretty_name -community_id $community_selected]
+#} else {
+#       set community_name [cards::get_community_pretty_name -community_id $community_id]
+#}
+
+
+
+# Access control
+set site_wide_admin_p [permission::permission_p \
+    -object_id [acs_magic_object security_context_root] \
+    -privilege admin \
+]
+
+if {!$site_wide_admin_p} {
+    set admin_p [dotlrn::user_can_admin_community_p -user_id $my_user_id -community_id $community_id]
+} else {
+    set admin_p 1
+}
+
+set site_admin [acs_user::site_wide_admin_p]
+
+        
+        
+#****************************************************
+#OPCIONES DE MANTENIMIENTO
+#****************************************************
+
+# Baja de alumnos no miembros de la comunidad ==> POR DECIDIR
+
+
+# ------------------------------------------------------------------
+# ALTA de alumnos miembros de la comunidad sin ficha
+# ------------------------------------------------------------------
+# 1. seleccionar usuarios sin card para la comunidad
+set num_notes_created 0
+set l_students_no_card [cards::get_no_card_student_list -community_id $community_id]
+
+# 2. Seleccionar anotaciones de la comunidad
+#db_multirow community_notes community_notes_sql { *SQL* }
+set l_tasks [cards::get_community_tasks -community_id $community_id]
+
+
+# 3. Crear las CARDS a los usuarios sin card
+foreach usr $l_students_no_card {
+        # creamos la card
+    #db_dml insert_add_new_card { *SQL* }
+        cards::create_student_card -community_id $community_id -user_id $usr
+        
+        # Obtenemos su card_id en esa comunidad
+    #db_1row card_user_id { *SQL* }
+        set card_id [cards::get_card_id -community_id $community_id -user_id $usr]      
+        
+        # Para cada anotacion de la comunidad
+    foreach task $l_tasks {
+                # 4. Crear las anotaciones a los alumnos
+                #db_dml insert_pending_notes { *SQL* }
+                cards::create_student_note -community_id $community_id -card_id $card_id -task_id $task
+                set num_notes_created [expr $num_notes_created + 1]
+        }
+}
+
+# Numero de fichas creadas y anotaciones puestas al dia
+set num_cards_created [llength $l_students_no_card]
+#set num_notes_created [llength $l_tasks]
+#****************************************************
+
+
+# Students Redirect to its student card
+if {!$admin_p} {
+        ad_returnredirect "student_card?user_id=$my_user_id&nav_sel=ficha"
+        }
+
+# Mostrar el listado de alumnos con ficha
+
+
+if {$community_selected ne $parent_community_id} {
+        db_multirow current_members select_sc_estudents_info { *SQL* }
+} else { 
+        db_multirow current_members select_students_info { *SQL* }
+}
+# faltar�a arreglarlo aunque de momento no hace falta xq si estamos en un subgrupo no se nos muestran las fichas por defecto
+
+
+# CSV   
+if { $mode eq "csv" } {
+
+
+set elements [list first_names [list label "#dotlrn.First_Name#"]]
+
+        lappend elements last_name \
+                [list label "#dotlrn.Last_Name#"]
+                
+        lappend elements email \
+                [list label "#dotlrn.Email#"]
+
+template::list::create \
+    -name csv_members \
+    -multirow current_members \
+    -key user_id_id \
+    -elements $elements \
+        -selected_format csv -formats {
+        csv { output csv }
+    }
+    template::list::write_output -name csv_members
+}
+        
Index: openacs-4/packages/cards/www/cards_list.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/cards_list.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/cards_list.xql	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+
+<queryset>
+    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+    <fullquery name="select_students_info">
+        <querytext>
+                        select acs_users_all.user_id as user_id,
+                                        card_id,
+                                        last_name,
+                                        first_names,
+                                        email
+                        from    acs_users_all,
+                                        dotlrn_member_rels_approved 
+                                                inner join card on (ref_user = user_id) 
+                        where dotlrn_member_rels_approved.community_id = :community_id and 
+                                        dotlrn_member_rels_approved.user_id = acs_users_all.user_id and 
+                                        (role='student' or role='member') and 
+                                        card.ref_community = community_id 
+                        order by $order $order_dir      
+        </querytext>
+    </fullquery>
+        
+        
+        
+        <fullquery name="select_sc_estudents_info">
+                <querytext>
+                        select 
+                                acs_users_all.user_id as user_id,
+                                card_id,
+                                last_name,
+                                first_names,
+                                email
+                        from
+                                acs_users_all,
+                                dotlrn_member_rels_approved 
+                        inner join 
+                                card on (ref_user = user_id) 
+                        where 
+                                dotlrn_member_rels_approved.community_id = :community_id and 
+                                dotlrn_member_rels_approved.user_id = acs_users_all.user_id and 
+                                (role='student' or role='member') and 
+                                card.ref_community = :community_id and 
+                                acs_users_all.user_id in (
+                                        select acs_users_all.user_id 
+                                        from acs_users_all, dotlrn_member_rels_approved 
+                                        where 
+                                                dotlrn_member_rels_approved.community_id = :community_selected and 
+                                                dotlrn_member_rels_approved.user_id = acs_users_all.user_id and 
+                                                (role='student' or role='member')
+                                ) 
+                        order by $order $order_dir      
+        </querytext>
+    </fullquery>
+        
+</queryset>
+
+
Index: openacs-4/packages/cards/www/eval2cards.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/eval2cards.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/eval2cards.adp	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,80 @@
+<!-- <master>  -->
+<SCRIPT LANGUAGE="JavaScript">
+<!-- Original:  Paco Soler -->
+<!-- Begin
+function validaForm (f) {
+        if (f.mode.value == "cancel") {
+                f.block_name.value = "";
+                f.block_percent.value = 0;
+                f.block_rvalor.value = 0;
+                return true;
+        } else {
+        error = 0
+        if (f.block_name.value == "" || f.block_name.value == " ") {
+                f.block_name.style.backgroundColor="#ffcc00";
+                error = 1
+        } else {f.block_name.style.backgroundColor="#ffffff";}
+        if (isNaN(f.block_percent.value) || parseInt(f.block_percent.value) > 100 || parseInt(f.block_percent.value) < 0) {
+                        f.block_percent.style.backgroundColor="#ffcc00";
+                        error = 2
+        } else {f.block_percent.style.backgroundColor="#ffffff";}
+        if (isNaN(f.block_rvalor.value) || parseInt(f.block_rvalor.value) > 10 || parseInt(f.block_rvalor.value) < 0){          
+                        f.block_rvalor.style.backgroundColor="#ffcc00"
+                        error = 3                       
+        } else {f.block_rvalor.style.backgroundColor="#ffffff";}
+
+        if (error > 0) { alert ("#cards.card_Invalid_data#");return false}
+        else return true
+        }
+}       
+        
+//  End -->
+</script>
+
+<link rel="stylesheet" href="cards.css" type="text/css">
+<!-- CABECERA -->
+<DIV id="all" class="all">
+<!-- CABECERA -->
+        <div class="comm">@community_name@</div>
+        <div class="back">
+                <A HREF="cards_list" class="back">#cards.card_Back#</A>
+        </div>
+
+<div class="spacer">&nbsp;</div>
+
+
+<H2 style="color:darkblue">#cards.import_grades_from_eval#</H2>
+
+<!-- package_id = @package_id
+TABLA DE TAREAS EVALUATION&CARDS-->
+<if @mode@ eq 'update'>
+
+</if>
+<else>
+
+<if @taskXgrade:rowcount@ ne 0 and @taskXbloc:rowcount@ ne 0>
+<P style="width:65%">#cards.eval2card_info#</P>
+
+<FORM METHOD="post" name="task_notes">
+<P><B>#cards.select_evaluation_task#</B><BR>
+<SELECT name="e_task">
+  <multiple name="taskXgrade">
+        <OPTION selected value="@taskXgrade.task_item_id@">@taskXgrade.egt_name@</OPTION>       
+  </multiple>
+</SELECT>
+
+<P><B>#cards.select_card_task#</B><BR>
+<SELECT name="c_task">
+  <multiple name="taskXbloc">
+        <OPTION selected value="@taskXbloc.task_id@">@taskXbloc.cbt_name@</OPTION>      
+  </multiple>
+</SELECT>
+<BR>
+<input type="hidden" name="mode" value="update">                
+<P><INPUT TYPE="SUBMIT" VALUE="#cards.Import_grades_#" onClick="return confirm('#cards.import_grades_confirm#')">
+</form>
+
+</if>
+<else>#cards.no_tasks_to_import#</else>
+
+</else>
Index: openacs-4/packages/cards/www/eval2cards.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/eval2cards.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/eval2cards.tcl	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,118 @@
+# /cards/eval2cards
+
+ad_page_contract {    
+        Paco Soler Lahuerta
+        fransola@uv.es
+} -query {
+    {mode:optional ""}
+    {e_task:optional ""}
+    {c_task:optional ""}
+
+}
+
+
+# Check if we are in a subcommunity. In this case, we use the big parent community cards
+# but only show the user cards that are in subgroup
+
+# Community and big parent community
+set community_selected [dotlrn_community::get_community_id]
+set community_name [cards::get_community_pretty_name -community_id $community_selected]
+set parent_community_id [cards::get_big_parent_community -community_id $community_selected]
+set reuse_parent_cards [cards::get_community_parameter -community_id $community_selected -param "ReuseParentCards"]
+
+if {$community_selected == $parent_community_id} {
+        set subgroup 0
+        set community_id $community_selected
+} else {
+        set subgroup 1
+        set community_id $community_selected
+        # If we reuse the cards we have to do the next actions, otherwise notihing to do
+        if {$reuse_parent_cards eq 1} {
+                set community_id $parent_community_id
+                set community_name [cards::get_community_pretty_name -community_id $community_id]
+                append  community_name " :: " [cards::get_community_pretty_name -community_id $community_selected]
+        }
+}
+
+
+
+if {$reuse_parent_cards == 1} {
+        ad_returnredirect "cards_error?num_e=3"
+} else {
+
+
+# Obtenemos  comunity_id
+#set community_id [dotlrn_community::get_community_id]
+#set community_name [cards::get_community_pretty_name -community_id $community_id]
+# Obtenemos pakage_id del paquete evaluation para la comunidad
+set ev_ctrl [db_0or1row get_evaluation_pid {* SQL *}]
+
+
+
+
+# Si no hay paquete volvemos de donde ven�amos
+if {$ev_ctrl == 0} { 
+    ad_returnredirect "cards_error?num_e=1"
+} else {
+
+        if {$mode == "update"} {
+
+        # Obtenemos el perfect score de la tarea de evaluation seleccionada
+        db_1row get_perfect_score {* SQL *}
+        # Obtenemos el max_grade de la tarea de card seleccionada
+        db_1row get_max_grade {* SQL *}
+        
+        
+        
+        # Seleccionar las notas de las tareas de cada alumno en evaluation
+        db_multirow task_notes get_task_notes {* SQL *}
+        set cont 0
+        # actualizarla con las de evaluation
+        multirow foreach task_notes {
+                if {[empty_string_p $grade]} {
+                        set grade 0.00
+                } else {                                        
+                
+                        if {$perfect_score > 0} {
+                                set grade [expr $grade * $max_grade / 100]
+                        }
+                
+                        # Si el party id es un grupo buscamos los usuarios
+                        set is_group [db_0or1row get_is_group "select group_id from evaluation_task_groups where group_id = :party_id"]
+                
+                        # Si no es un grupo
+                        if {$is_group == 0} {           
+                                db_1row get_card_id  {* SQL *}
+                                db_dml update_c_task  { *SQL* }
+                                set cont [expr $cont + 1]
+                                set mode ""
+                        # Si es un grupo
+                        } else {
+                                db_multirow group_members get_group_members {* SQL *}
+                                multirow foreach group_members {
+                                        db_1row get_card_id  {* SQL *}
+                                        db_dml update_c_task  { *SQL* }
+                                        set cont [expr $cont + 1]
+                                        set mode ""                     
+                                }
+                        }
+                }
+        }
+        # redirigir a la pagina de notas para que la penya compruebe lo que hay.
+        if {$cont > 0} {
+                ad_returnredirect "grade_task?task_id=$c_task&mode=update&mode2=eval"
+        } else {
+                ad_returnredirect "cards_error?num_e=2"
+        }
+        
+        
+  } 
+        # obtenemos las tareas por asignaciones del evaluation de la  comunidad
+        db_multirow taskXgrade get_taskXgrades {* SQL *}
+  
+        # obtenemos las tareas por bloques de las cards de la comunidad
+        db_multirow taskXbloc get_taskXbloc {* SQL *}
+        
+ }
+}
+
Index: openacs-4/packages/cards/www/eval2cards.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/eval2cards.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/eval2cards.xql	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,97 @@
+<?xml version="1.0"?>
+<queryset>
+   <rdbms><type>postgresql</type><version>7.3</version></rdbms>
+
+<fullquery name="get_evaluation_pid">      
+        <querytext>
+                select object_id as package_id 
+                from acs_objects o, apm_packages p 
+                where o.object_id = p.package_id and p.package_key = 'evaluation' 
+                and o.context_id = (select package_id from dotlrn_communities_all 
+                                                        where community_id = :community_id)
+    </querytext>
+</fullquery>
+   
+<fullquery name="get_class_grades">      
+      <querytext>
+            select eg.grade_id, eg.item_id,     eg.grade_plural_name,
+                eg.comments,eg.weight
+            from evaluation_gradesx eg, acs_objects ao
+                where content_revision__is_live(eg.grade_id) = true
+          and eg.item_id = ao.object_id
+                  and ao.context_id = :package_id
+                $orderby
+      </querytext>
+</fullquery>
+
+<fullquery name="get_taskXgrades">      
+      <querytext>
+        select eg.grade_name || ' : ' || task_name as egt_name, eg.grade_id, eg.item_id, eg.weight, 
+                task_id, task_item_id
+        from evaluation_gradesx eg, acs_objects ao, evaluation_tasks et 
+        where   content_revision__is_live(eg.grade_id) = true and 
+                        content_revision__is_live(task_id) = true and 
+                        eg.item_id = ao.object_id and
+                        ao.context_id = :package_id and 
+                        et.grade_item_id = eg.grade_item_id
+      </querytext>
+</fullquery>
+
+<fullquery name="get_taskXbloc">      
+      <querytext>
+                select p.percent_name || ' : ' || t.task_name as cbt_name, 
+                        t.task_id, p.percent_id 
+                from card_percent p, card_task t 
+                where t.ref_community = p.ref_community and 
+                        p.ref_community = :community_id and p.percent_id = t.ref_percent;
+      </querytext>
+</fullquery>
+
+<fullquery name="get_task_notes">      
+      <querytext>
+                        select *, (select description from  evaluation_student_evalsx where evaluation_id=ev.evaluation_id) as comments from evaluation_student_evals ev where task_item_id = :e_task
+      </querytext>
+</fullquery>
+
+<fullquery name="update_c_task">      
+    <querytext>
+                update card_note set grade = :grade, note_comment = :comments
+                        where ref_task = :c_task and
+                                ref_card = :card_id and
+                                ref_community = :community_id
+     </querytext>
+</fullquery>
+
+<fullquery name="get_perfect_score">      
+      <querytext>
+                select perfect_score 
+                from evaluation_tasks, cr_items 
+                where task_item_id = item_id and 
+                        live_revision = task_id and 
+                        task_item_id = :e_task
+      </querytext>
+</fullquery>
+
+<fullquery name="get_max_grade">      
+      <querytext>
+                        select max_grade from card_task where task_id = :c_task
+      </querytext>
+</fullquery>
+
+<fullquery name="get_group_members">      
+      <querytext>
+                        select p.person_id as party_id from persons p, acs_rels map where p.person_id = map.object_id_two and map.object_id_one = :party_id
+      </querytext>
+</fullquery>
+
+
+<fullquery name="get_card_id">      
+      <querytext>
+                        select card_id from card where ref_community = :community_id and ref_user = :party_id
+      </querytext>
+</fullquery>
+
+
+
+
+</queryset>
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/cards/www/eval_note.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/cards/www/eval_note.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/cards/www/eval_note.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/cards/www/gest_eval.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/cards/www/gest_eval.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/cards/www/gest_eval.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/cards/www/gest_notes.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/cards/www/gest_notes.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/cards/www/gest_notes.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/cards/www/grade_task.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/grade_task.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/grade_task.adp	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,71 @@
+<master>
+<SCRIPT LANGUAGE="JavaScript">
+<!--
+function convertComma(str){
+var out = "", flag = 0;
+
+for (i = 0; i < str.length; i++) {
+        if (str.charAt(i) != ",") {
+                out += str.charAt(i);
+                flag = 0;
+        } else {
+                if(flag == 0) {
+                        out += ".";
+                        flag = 1;
+                }
+        }
+}
+
+if (isNaN(out) || str == "") {
+        out = 0.00
+} 
+
+return out;
+}
+-->
+</script>
+
+<link rel="stylesheet" href="cards.css" type="text/css">
+<!-- CABECERA -->
+<DIV class="all">
+<div class="comm">@community_name@</div>
+<div class="back">
+        <A HREF="@return_url@" class="back">#cards.card_Back#</A>
+</div>
+<div class="spacer">&nbsp;</div>
+
+<div class="all">
+
+<if @mode@ eq "edit">
+<H3 style="color:#6186B0">#cards.task_grade_edit# @task_name@<BR>
+#cards.card_task_max_grade#: @max_grade@</h3>
+<form name="gt" action="" method="post">
+                <input type="hidden" name="task_id" value="@task_id@">
+                <input type="hidden" name="mode" value="update">
+                <listtemplate name="task_grades"></listtemplate>
+                @task_grades:rowcount@ #cards.card_Students#<BR><BR>
+                <INPUT type="submit" value="#cards.send_task_grades#" 
+                onclick="document.gt.mode.value='update'" title="#cards.tooltip_save_changes#"></FORM>
+                <FORM action="manage_tasks">
+                <INPUT type="submit" value="#cards.card_Cancel#" title="#cards.tooltip_discard_changes#"></FORM>
+</form>
+</if>
+
+
+<if @mode@ eq "update">
+<H3 style="color:#6186B0">#cards.task_grades_act# 
+        <if @mode2@ eq "eval"> #cards.from_eval#</if>: @task_name@      
+        <BR>#cards.card_task_max_grade#: @max_grade@</h3>
+<listtemplate name="task_grades"></listtemplate>
+        @task_grades:rowcount@ #cards.card_Students#<BR><BR>
+<div class="back_l">
+        <A HREF="@return_url@" class="back">#cards.card_Back#</A>
+</div>
+<BR><BR>        
+        
+</if>
+</div>
+
+<if @error@>
+        <SCRIPT>alert("@msg_error@")</SCRIPT>
+</if>
Index: openacs-4/packages/cards/www/grade_task.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/grade_task.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/grade_task.tcl	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,256 @@
+ad_page_contract {
+}  -query {  
+        task_id:integer,notnull
+
+    item_ids:array,integer,optional
+    item_to_edit_ids:array,integer,optional
+    
+    evaluation_ids:array,integer,optional
+
+    grade:array,optional
+    note_comment:array,optional
+    is_active:array,optional    
+        
+  {mode:optional "edit"}  
+  {mode2:optional ""}  
+} -properties {
+} -validate {
+    valid_grade {
+        set counter 0
+        foreach note_id [array names grade] {
+          if { [info exists grade($note_id)] && ![empty_string_p $grade($note_id)] } {
+                incr counter
+                set grade($note_id) [template::util::leadingTrim $grade($note_id)]
+                if { ![ad_var_type_check_number_p $grade($note_id)] } {
+                set wrong_grade $grade($note_id)
+                ad_complain "[_ evaluation.lt_The_grade_must_be_a_v]"
+                }
+          }
+        }
+    }
+        valid_note_comment {
+                foreach note_id [array names note_comment] {
+            if { [info exists note_comment($note_id)] && ![info exists grade($note_id)] } {
+                set wrong_comments $note_comment($note_id)
+                ad_complain "[_ evaluation.lt_There_is_a_comment_fo]"
+            }
+            if { [info exists note_comment($note_id)] && ([string length $note_comment($note_id)] > 400) } {
+                set wrong_comments $note_comment($note_id)
+                ad_complain "[_ evaluation.lt_There_is_a_comment_la]"
+            }
+        }
+        }
+}
+
+# Declaraci� de variables a emprar
+set error 0
+set msg_error ""
+set link_url ""
+set is_edit 0
+set return_url "manage_tasks"
+
+# Comunitat a la que estem. Check if we are in a subcommunity. In this case, we use the big parent community.
+# but we only show the user cards that are in subgroup
+# Community and big parent community
+set community_selected [dotlrn_community::get_community_id]
+set community_name [cards::get_community_pretty_name -community_id $community_selected]
+set parent_community_id [cards::get_big_parent_community -community_id $community_selected]
+set reuse_parent_cards [cards::get_community_parameter -community_id $community_selected -param "ReuseParentCards"]
+if {$community_selected == $parent_community_id} {
+        set subgroup 0
+        set community_id $community_selected
+} else {
+        set subgroup 1
+        set community_id $community_selected
+        # If we reuse the cards we have to do the next actions, otherwise notihing to do
+        if {$reuse_parent_cards eq 1} {
+                set community_id $parent_community_id
+                set community_name [cards::get_community_pretty_name -community_id $community_id]
+                append  community_name " :: " [cards::get_community_pretty_name -community_id $community_selected]              
+        }
+}
+
+
+#set community_id [dotlrn_community::get_community_id]
+#set community_selected $community_id
+#set community_id [cards::get_big_parent_community -community_id $community_id]
+
+#if {$community_selected ne $community_id} {
+#       append community_name [cards::get_community_pretty_name -community_id $community_id] \
+#       " :: " [cards::get_community_pretty_name -community_id $community_selected]
+#} else {
+#       set community_name [cards::get_community_pretty_name -community_id $community_id]
+#}
+
+
+
+# Usuari que som y url a la que estem
+set my_user_id [ad_conn user_id]
+set referer [ns_conn url]
+
+# Si no som administradors  [admin_p = 0] --> error: permis denegat 
+set admin_p [dotlrn::user_can_admin_community_p -user_id $my_user_id -community_id $community_id]
+if {!$admin_p} {
+                        ad_return_error [lang::util::localize "#acs-subsite.Error#"] [lang::util::localize "#dotlrn.deniedpermission#"]         
+}
+
+# Obtenemos datos de la tarea
+db_1row get_task_info { *SQL* }
+
+if {$mode eq "edit"} {
+
+
+if {$parent_community_id ne $community_selected} {
+        db_multirow task_grades get_sc_task_grades { *SQL* }
+} else { 
+        db_multirow task_grades get_task_grades { *SQL* }
+}
+
+
+set elements [list name [list label "#cards.card_Student#" \
+        display_template {<span class="student">@task_grades.name@</span>}]]
+
+lappend elements note_comment \
+                [list label "#cards.card_Comment#" \
+                display_template {<TEXTAREA rows="2" cols="50" name="note_comment.@task_grades.note_id@" wrap>@task_grades.note_comment@</TEXTAREA>}]
+                
+lappend elements grade \
+                [list label "#cards.card_Grade#" \
+                display_template {<INPUT type="text" size="4" name="grade.@task_grades.note_id@" value="@task_grades.grade@" onblur="this.value = convertComma(this.value);">}]
+
+if {$type == 2} {
+        lappend elements is_active \
+                [list label "#cards.card_Active#" \
+                display_template {
+                  <if @task_grades.is_active@>
+                  <INPUT type="checkbox" size="1" name="is_active.@task_grades.note_id@" value="1" checked>               
+                  </if><else>
+                  <INPUT type="checkbox" size="1" name="is_active.@task_grades.note_id@" value="1">
+                  </else>}] 
+}
+
+template::list::create \
+    -name task_grades \
+    -multirow task_grades \
+    -key note_id \
+    -elements $elements
+}
+
+        
+set num_activas 0
+
+if {$mode == "update"} {
+ if {$mode2 == ""} {
+        set num_activas 0
+  set l_notes [db_list get_note_ids { *SQL* }]
+  foreach note_id $l_notes {                            
+        if {[info exists grade($note_id)] && ![empty_string_p $$grade($note_id)]} {
+          set new_grade $grade($note_id)
+        } else {
+          set new_grade 0.00
+        }
+        if {[info exists grade($note_id)]} {
+          set new_comment [DoubleApos $note_comment($note_id)]
+        } else {
+          set new_comment ""
+        }
+        
+        if {[info exists is_active($note_id)]} {
+                set num_activas [expr $num_activas + 1]
+                if {$is_active($note_id)} {
+                        set new_actv 1
+                } else {
+                        set new_actv 0
+                }
+        } else {
+                if {$type == 2} {
+                        set new_actv 0
+                        set num_activas [expr $num_activas + 1]
+                } else {
+                        set new_actv 1
+                }
+        }        
+        db_dml update_note { *SQL* }
+  }
+  } else {
+  set return_url "eval2cards"
+  }
+        # Obtenemos datos de la tarea   
+if {$community_id ne $community_selected} {
+        db_multirow task_grades get_sc_task_grades { *SQL* }
+} else { 
+        db_multirow task_grades get_task_grades { *SQL* }
+}       
+
+        set elements [list name [list label "#cards.card_Student#"]]
+
+        lappend elements note_comment \
+                [list label "#cards.card_Comment#" \
+                display_template {<pre>@task_grades.note_comment@</pre>}]
+                
+lappend elements grade \
+                [list label "#cards.card_Grade#" \
+                display_template {@task_grades.grade@}]
+
+if {$type == 2} {
+        lappend elements is_active \
+                [list label "#cards.card_Active#" \
+                display_template {
+                  <if @task_grades.is_active@>
+                  <INPUT type="checkbox" size="1" name="is_active.@task_grades.note_id@" value="1" checked disabled>
+                  </if><else>
+                  <INPUT type="checkbox" size="1" name="is_active.@task_grades.note_id@" value="1" disabled>
+                  </else>}] 
+}
+
+
+template::list::create \
+    -name task_grades \
+    -multirow task_grades \
+    -key note_id \
+    -elements $elements 
+}
+
+
+if { $mode eq "csvchanged" } {
+
+set mode ""
+# Obtenemos datos de la tarea   
+if {$community_id ne $community_selected} {
+        db_multirow task_grades get_sc_task_grades { *SQL* }
+} else { 
+        db_multirow task_grades get_task_grades { *SQL* }
+}
+
+set elements [list name [list label "#cards.card_Student#"]]
+
+        lappend elements note_comment \
+                [list label "#cards.card_Comment#" \
+                display_template {<pre>@task_grades.note_comment@</pre>}]
+                
+        lappend elements grade \
+                [list label "#cards.card_Grade#" \
+                display_template {@task_grades.grade@}]
+
+if {$type == 2} {
+        lappend elements is_active \
+                [list label "#cards.card_Active#" \
+                display_template {
+                  <if @task_grades.is_active@>
+                  <INPUT type="checkbox" size="1" name="is_active.@task_grades.note_id@" value="1" checked disabled>
+                  </if><else>
+                  <INPUT type="checkbox" size="1" name="is_active.@task_grades.note_id@" value="1" disabled>
+                  </else>}] 
+}
+
+
+template::list::create \
+    -name task_grades \
+    -multirow task_grades \
+    -key note_id \
+    -elements $elements \
+        -selected_format csv -formats {
+        csv { output csv }
+    }
+    template::list::write_output -name task_grades
+}
Index: openacs-4/packages/cards/www/grade_task.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/grade_task.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/grade_task.xql	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+
+<queryset>
+    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+        <fullquery name="get_task_info">      
+      <querytext>
+                select t.*,p.type as type 
+                from card_task t, card_percent p 
+                where 
+                        task_id = :task_id and 
+                        t.ref_community = p.ref_community and 
+                        t.ref_percent = p.percent_id
+      </querytext>
+        </fullquery>
+        
+        <fullquery name="get_task_grades">      
+      <querytext>
+                select  last_name||', '||first_names as name,
+                                note_id, ref_card, grade, note_comment, is_active 
+                from card_note, acs_users_all, card 
+                where   ref_task = :task_id and 
+                                user_id = ref_user and ref_card=card_id
+                                and user_id in (
+                                        select  a.user_id as user_id
+                                        from    acs_users_all a, dotlrn_member_rels_approved r 
+                                        where   r.community_id = :community_id and 
+                                                        r.user_id = a.user_id and
+                                                        (role='student' or role='member')
+                                                        order by user_id asc                            
+                                        )
+                order by last_name
+      </querytext>
+        </fullquery>
+        
+        <fullquery name="get_sc_task_grades">      
+      <querytext>
+                select  last_name||', '||first_names as name,
+                                note_id, ref_card, grade, note_comment, is_active 
+                from card_note, acs_users_all, card 
+                where   ref_task = :task_id and 
+                                user_id = ref_user and ref_card=card_id
+                                and user_id in (
+                                        select  a.user_id as user_id
+                                        from    acs_users_all a, dotlrn_member_rels_approved r 
+                                        where   r.community_id = :community_selected and 
+                                                        r.user_id = a.user_id and
+                                                        (role='student' or role='member')
+                                                        order by user_id asc                            
+                                        )
+                order by last_name
+      </querytext>
+        </fullquery>    
+        
+
+
+        <fullquery name="get_note_ids">      
+      <querytext>
+                select  note_id
+                from card_note
+                where   ref_task = :task_id
+      </querytext>
+        </fullquery>    
+        
+<fullquery name="update_note">
+    <querytext>
+                update card_note set 
+                grade = :new_grade, note_comment= :new_comment, is_active= :new_actv
+                where note_id = :note_id
+        </querytext>
+</fullquery>            
+        
+        
+</queryset>
+
Index: openacs-4/packages/cards/www/grade_task_list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/grade_task_list.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/grade_task_list.adp	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,24 @@
+<link rel="stylesheet" type="text/css" href="/resources/acs-templating/lists.css" media="all" />
+<link rel="stylesheet" href="cards.css" type="text/css">
+
+<DIV class="all">
+<!-- CABECERA -->
+        
+        <H3 class="black">@community_name@<BR>@task_name@ 
+        <span class="small">[#cards.card_task_max_grade#: @max_grade@]</span></h3>
+
+        <DIV>   
+                <listtemplate name="task_grades"></listtemplate>
+                <P>@task_grades:rowcount@ #cards.card_Students#
+        <DIV>   
+
+        <div class="back_l">
+        <A HREF="manage_tasks" class="back">#cards.card_Back#</A>
+        </div>
+        <BR><BR>        
+        
+</div>
+
+<if @error@>
+        <SCRIPT>alert("@msg_error@")</SCRIPT>
+</if>
Index: openacs-4/packages/cards/www/grade_task_list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/grade_task_list.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/grade_task_list.tcl	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,137 @@
+ad_page_contract {
+}  -query {  
+        task_id:integer,notnull
+
+  {mode:optional "list"}  
+} -properties {
+} 
+
+# Declaraci� de variables a emprar
+set error 0
+set msg_error ""
+set link_url ""
+set is_edit 0
+
+# Comunitat a la que estem. Check if we are in a subcommunity. In this case, we use the big parent community.
+# but we only show the user cards that are in subgroup
+# Community and big parent community
+set community_selected [dotlrn_community::get_community_id]
+set community_name [cards::get_community_pretty_name -community_id $community_selected]
+set parent_community_id [cards::get_big_parent_community -community_id $community_selected]
+set reuse_parent_cards [cards::get_community_parameter -community_id $community_selected -param "ReuseParentCards"]
+if {$community_selected == $parent_community_id} {
+        set subgroup 0
+        set community_id $community_selected
+} else {
+        set subgroup 1
+        set community_id $community_selected
+        # If we reuse the cards we have to do the next actions, otherwise notihing to do
+        if {$reuse_parent_cards eq 1} {
+                set community_id $parent_community_id
+                set community_name [cards::get_community_pretty_name -community_id $community_id]
+                append  community_name " :: " [cards::get_community_pretty_name -community_id $community_selected]              
+        }
+}
+
+
+
+# Usuari que som y url a la que estem
+set my_user_id [ad_conn user_id]
+set referer [ns_conn url]
+
+# Si no som administradors  [admin_p = 0] --> error: permis denegat 
+set admin_p [dotlrn::user_can_admin_community_p -user_id $my_user_id -community_id $community_id]
+if {!$admin_p} {
+                        ad_return_error [lang::util::localize "#acs-subsite.Error#"] [lang::util::localize "#dotlrn.deniedpermission#"]         
+}
+
+# Obtenemos datos de la tarea
+db_1row get_task_info { *SQL* }
+
+# Obtenemos datos del bloque. En concreto el % para ctrl caso especia % = 0
+db_1row get_block_percent { *SQL* }
+
+# Obtenemos datos de la tarea   
+if {$community_selected ne $community_selected} {
+        db_multirow task_grades get_sc_task_grades { *SQL* }
+} else { 
+        db_multirow task_grades get_task_grades { *SQL* }
+}
+
+if { $mode eq "list" } {
+set mode ""
+set elements [list name [list label "#cards.card_Student#"]]
+#lappend elements note_comment \
+                [list label "#cards.card_Comment#" \
+                display_template {<pre>@task_grades.note_comment@</pre>}]
+                
+if {$percent == 0} {
+                lappend elements note_comment \
+                [list label "#cards.card_Comment#" \
+                display_template {@task_grades.note_comment@}]
+                lappend elements grade \
+                [list label "&nbsp;&nbsp;&nbsp;#cards.card_Grade#" \
+                display_template {&nbsp;&nbsp;&nbsp;@task_grades.grade@}]
+} else {                
+        lappend elements grade \
+                [list label "&nbsp;&nbsp;&nbsp;#cards.card_Grade#" \
+                display_template {&nbsp;&nbsp;&nbsp;@task_grades.grade@}]
+}
+
+if {$type == 2} {
+        lappend elements is_active \
+                [list label "#cards.card_Active#" \
+                display_template {
+                  <if @task_grades.is_active@>
+                  <INPUT type="checkbox" size="1" name="is_active.@task_grades.note_id@" value="1" checked disabled>
+                  </if><else>
+                  <INPUT type="checkbox" size="1" name="is_active.@task_grades.note_id@" value="1" disabled>
+                  </else>}] 
+}
+
+template::list::create \
+    -name task_grades \
+    -multirow task_grades \
+    -key note_id \
+    -elements $elements 
+}
+        
+# CSV   
+if { $mode eq "csv" } {
+
+set mode ""
+
+set elements [list name [list label "#cards.card_Student#"]]
+
+        lappend elements note_comment \
+                [list label "#cards.card_Comment#" \
+                display_template {<pre>@task_grades.note_comment@</pre>}]
+                
+        lappend elements grade \
+                [list label "#cards.card_Grade#" \
+                display_template {@task_grades.grade@}]
+
+if {$type == 2} {
+        lappend elements is_active \
+                [list label "#cards.card_Active#" \
+                display_template {
+                  <if @task_grades.is_active@>
+                  <INPUT type="checkbox" size="1" name="is_active.@task_grades.note_id@" value="1" checked disabled>
+                  </if><else>
+                  <INPUT type="checkbox" size="1" name="is_active.@task_grades.note_id@" value="1" disabled>
+                  </else>}] 
+}
+
+
+template::list::create \
+    -name task_grades \
+    -multirow task_grades \
+    -key note_id \
+    -elements $elements \
+        -selected_format csv -formats {
+        csv { output csv }
+    }
+    template::list::write_output -name task_grades
+}
+
+        
Index: openacs-4/packages/cards/www/grade_task_list.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/grade_task_list.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/grade_task_list.xql	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,84 @@
+<?xml version="1.0"?>
+
+<queryset>
+    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+        <fullquery name="get_task_info">      
+      <querytext>
+                select t.*,p.type as type 
+                from card_task t, card_percent p 
+                where 
+                        task_id = :task_id and 
+                        t.ref_community = p.ref_community and 
+                        t.ref_percent = p.percent_id
+      </querytext>
+        </fullquery>
+        
+        <fullquery name="get_task_grades">      
+      <querytext>
+                select  last_name||', '||first_names as name,
+                                note_id, ref_card, grade, note_comment, is_active 
+                from card_note, acs_users_all, card 
+                where   ref_task = :task_id and 
+                                user_id = ref_user and ref_card=card_id
+                                and user_id in (
+                                        select  a.user_id as user_id
+                                        from    acs_users_all a, dotlrn_member_rels_approved r 
+                                        where   r.community_id = :community_id and 
+                                                        r.user_id = a.user_id and
+                                                        (role='student' or role='member')
+                                                        order by user_id asc                            
+                                        )
+                order by last_name
+      </querytext>
+        </fullquery>
+
+        <fullquery name="get_sc_task_grades">      
+      <querytext>
+                select  last_name||', '||first_names as name,
+                                note_id, ref_card, grade, note_comment, is_active 
+                from card_note, acs_users_all, card 
+                where   ref_task = :task_id and 
+                                user_id = ref_user and ref_card=card_id
+                                and user_id in (
+                                        select  a.user_id as user_id
+                                        from    acs_users_all a, dotlrn_member_rels_approved r 
+                                        where   r.community_id = :community_selected and 
+                                                        r.user_id = a.user_id and
+                                                        (role='student' or role='member')
+                                                        order by user_id asc                            
+                                        )
+                order by last_name
+      </querytext>
+        </fullquery>    
+
+
+        <fullquery name="get_note_ids">      
+      <querytext>
+                select  note_id
+                from card_note
+                where   ref_task = :task_id
+      </querytext>
+        </fullquery>    
+        
+<fullquery name="update_note">
+    <querytext>
+                update card_note set 
+                grade = :new_grade, note_comment= :new_comment, is_active= :new_actv
+                where note_id = :note_id
+        </querytext>
+</fullquery>    
+
+<fullquery name="get_block_percent">
+    <querytext>
+                select percent 
+                from card_percent, card_task
+                where   percent_id = ref_percent and
+                                task_id = :task_id      
+        </querytext>
+</fullquery>    
+
+        
+        
+</queryset>
+
Index: openacs-4/packages/cards/www/grades.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/grades.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/grades.adp	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,180 @@
+<SCRIPT LANGUAGE="JavaScript">
+<!--
+function check_text(campo, num, max) {
+if (campo.value.length > max) campo.value = campo.value.substring(0, max);
+else num.value = max - campo.value.length;
+}
+
+
+
+function convertComma(str){
+var out = "", flag = 0;
+
+for (i = 0; i < str.length; i++) {
+        if (str.charAt(i) != ",") {
+                out += str.charAt(i);
+                flag = 0;
+        } else {
+                if(flag == 0) {
+                        out += ".";
+                        flag = 1;
+                }
+        }
+}
+
+if (isNaN(out) || str == "") {
+        out = 0.00
+} 
+
+return out;
+}
+-->
+</script>
+
+<div class="spacer">&nbsp;</div>
+<TABLE class="uv_table1" summary="#cards.summary_card_grades#">
+        <tr>
+        <th colspan="3">#cards.card_Grades_list#</th>
+        <th colspan="4" class="final_grade">#cards.card_Average_grade#: 
+        <if @nota_final@ ne "NP" and @nota_final@ ne "4*"><%= [format "%2.2f" @nota_final@] %></if>
+        <else>@nota_final@</else>
+        </th>
+  </tr>
+
+<!--  ****************  MOSTRAR - NOTAS ALUMNO *************** -->
+<if @block:rowcount@ eq 0>
+#cards.card_No_notes#
+</if>
+<else>
+<multiple name="block">
+<if @nav_sel@ eq @block.percent_id@ or @nav_sel@ eq "">
+  <tr>
+        <th colspan="3" class="block">&nbsp;<B>@block.percent_name@</B> (@block.percent@%)
+        <if @block.rvalor@ gt 0>&nbsp;[>= @block.rvalor@] </if>
+        </th>
+        <th colspan="4" align="right" class="block_avg"><B>&nbsp;#cards.avg#: 
+           <%= [format "%2.2f" @block.block_grade@] %></B>
+           
+          (<%= [format "%2.2f" @block.block_gradep@] %>)</th>
+         
+  </tr>
+        
+  <tr class="list-odd" height="6">
+        <th width="21%" class="uv_cell">#cards.card_Note#</th>
+
+        <th width="12%" class="uv_cell">#cards.card_Date#</th>
+        <th width="45%" class="uv_cell">#cards.card_Comment#</th>
+        <th width="10%" class="uv_cell">#cards.card_Grade#</th>
+        <th width="3%" class="uv_cell">#cards.card_Active#</th>                  
+        <th width="5%" class="uv_cell">#cards.card_Action#</th>      
+  </tr>
+  <multiple name="grades">
+        <if @grades.ref_percent@ eq @block.percent_id@>
+          <if @grades.note_id@ ne @note_id@> <!--SI NO editamos -->
+          <tr class="list-even" onmouseover="javascript:style.backgroundColor='#99ccff'" 
+          onmouseout="javascript:style.backgroundColor='#FFFFFF'">
+                <td width="21%" class="uv_cell">@grades.task_name@ 
+                <if @grades.type@ eq 3>[@grades.task_percent@%]</if></td>
+
+       <td width="9%" class="uv_cell"><%=[string range [format "%s" @grades.date_mod@] 0 15]%></td>
+           <td width="45%" class="uv_cell">&nbsp;@grades.note_comment@</td>
+           <td width="10%" class="uv_cell"><B>@grades.grade@ / @grades.max_grade@&nbsp;</B></td>
+           <td width="3%" class="uv_cell">
+       <if @grades.is_active@>
+       <INPUT type="checkbox" size="1" name="noteact" checked disabled>
+       </if><else>
+       <INPUT type="checkbox" size="1" name="noteact" disabled>
+       </else>                         
+      </td>                   
+                        
+<!-- MODE EDIT LINK **************************************************-->                               
+        <FORM METHOD="post" action="student_notes#@grades.note_id@" name="fm">
+        <td width="5%" align="center" class="list">                     
+        <INPUT type="hidden" name="user_id" value="@user_id@">
+        <INPUT type="hidden" name="note_id" value="@grades.note_id@">
+        <INPUT type="hidden" name="nav_sel" value="@nav_sel@">
+        <INPUT type="hidden" name="mode" value="note_edit">
+        <INPUT type="image" name="submit" value="submit" border="0" alt="#cards.card_Edit# #cards.card_Grade#" title="#cards.card_Edit# #cards.card_Grade#" src="icons/edit.gif">
+        </td>
+        </form>                 
+        </if><else> <!--SI editamos -->
+          <if @grades.note_id@ ne @note_id@> <!--NO ES LA EDITADA -->
+                <tr class="list-even">
+                <td width="21%" class="uv_cell">@grades.task_name@ 
+                <if @grades.type@ eq 3>[@grades.task_percent@%]</if></td>
+                <td width="9%" class="uv_cell">&nbsp;
+                        <%= [string range [format "%s" @grades.date_mod@] 0 15] %></td>
+                <td width="45%" class="uv_cell">&nbsp;@grades.task_comment@</td>
+           <td width="10%" class="uv_cell" align="right"><B>@grades.grade@ / @grades.max_grade@&nbsp;</B></td>
+                <td width="3%" class="uv_cell">
+                        <if @grades.is_active@>
+                        <INPUT type="checkbox" size="1" name="noteact" checked disabled>
+                        </if><else><INPUT type="checkbox" size="1" name="noteact" disabled></else></td>
+                        <td width="7%" align="right" class="uv_cell">&nbsp;</td>                         
+          </if><else> <!-- ES LA EDITADA -->
+                <tr class="uv_cell_insert">
+                <td width="21%" class="uv_cell_insert">@grades.task_name@ 
+                <if @grades.type@ eq 3>[@grades.task_percent@%]</if></td>
+
+                <td width="9%" class="uv_cell_insert">&nbsp;
+                        <%= [string range [format "%s" @grades.date_mod@] 0 15] %></td>
+                <!-- FORMULARIO -->
+                
+                <FORM METHOD="post" name="fe">
+                <INPUT type="hidden" name="user_id" value="@user_id@">
+                <INPUT type="hidden" name="note_id" value="@note_id@">
+                <INPUT type="hidden" name="nav_sel" value="@nav_sel@">
+                <td width="45%" class="uv_cell_insert"><CENTER>
+                <A name="@note_id@">
+                <TEXTAREA rows="3" cols="60" name="note_comment" wrap 
+                onKeyDown="check_text(this.form.note_comment,this.form.resto,400);" 
+                onKeyUp="check_text(this.form.note_comment,this.form.resto,400)">@grades.note_comment@</TEXTAREA><BR>
+
+                <SPAN class="char"># M�ximo 400 car�cteres. Quedan: 
+                <input readonly type="text" name="resto" size="3" maxlength="3" value="400"></span></center>
+                <!--<INPUT type="text" size="75" name="note_comment" value="@grades.note_comment">--></td>
+                <td width="8%" class="uv_cell_insert" align="right">
+                <INPUT type="text" size="4" name="note_grade" value="@grades.grade@"
+                onblur="this.value = convertComma(this.value);">&nbsp;</td>
+                <td width="3%" class="uv_cell_insert">
+                <if @grades.is_active@>
+                  <if @grades.type@ eq 2>
+                  <INPUT type="checkbox" size="1" name="note_act" value="1" checked="true">
+                  </if><else>
+                  <INPUT type="checkbox" size="1" name="note_act" value="1" checked="true" disabled>
+                  <INPUT type="hidden" size="1" name="note_act_yes" value="1">
+                  </else>
+                </if>
+                <else>
+                  <if @grades.type@ eq 2>
+                  <INPUT type="checkbox" size="1" name="note_act" value="1">
+                  </if>
+                  <else>
+                        <INPUT type="checkbox" size="1" name="note_act" value="1" disabled>
+                  </else>
+                </else>
+                </td>
+                <td width="5%" align="center" class="uv_cell_insert">                   
+                <INPUT type="hidden" name="mode" value="">               
+                <INPUT type="image" name="submit" value="submit" size="10" src="icons/ok.gif" 
+                ALT="#cards.card_Accept#" title="#cards.card_Accept#"
+                onclick="document.fe.mode.value='note_update'">
+                <INPUT type="image" name="submit" value="submit" size="10" src="icons/ko.gif" 
+                ALT="#cards.card_Cancel#" title="#cards.card_Cancel#" 
+                onclick="document.fe.mode.value=''">
+                </td>  
+                </FORM>
+          </else>
+        </else>
+        </tr>
+  </if>
+  </multiple>
+</if>   
+</multiple>
+</else>
+<TR>
+<TD COLSPAN="6" align="right">#cards.card_Without_academic_validity#
+</TD>
+</TR>
+</table>
+<BR>
Index: openacs-4/packages/cards/www/grades.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/grades.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/grades.tcl	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,131 @@
+ad_page_contract {
+}  -query {     
+  user_id:integer,notnull
+  {mode:optional ""}  
+  {nav_sel:optional ""}
+  {note_id:optional ""}
+} -properties { 
+        block:multirow
+        grades:multirow
+}
+
+# Esto es una xorrada. pero si no lo pongo no va. 
+#set uid $user_id 
+#set m $mode 
+set nid $note_id 
+#set nsel $nav_sel
+
+
+template::multirow create block percent_id percent_name type percent rvalor block_grade block_gradep
+template::multirow create grades note_id ref_card task_name task_percent date date_mod note_comment grade gradep max_grade is_active ref_percent type
+
+
+# Declaraci� de variables
+set widthheight_param "width=72 height=90"
+set export_vars [export_url_vars user_id]
+acs_user::get -user_id $user_id -array user_info
+set existe_photo 1
+set subsite_url [subsite::get_element -element url]
+set is_edit 0
+
+# Comunitat a la que estem. Check if we are in a subcommunity. In this case, we use the big parent community.
+# but we only show the user cards that are in subgroup
+# Community and big parent community
+set community_selected [dotlrn_community::get_community_id]
+set community_name [cards::get_community_pretty_name -community_id $community_selected]
+set parent_community_id [cards::get_big_parent_community -community_id $community_selected]
+set reuse_parent_cards [cards::get_community_parameter -community_id $community_selected -param "ReuseParentCards"]
+if {$community_selected == $parent_community_id} {
+        set subgroup 0
+        set community_id $community_selected
+} else {
+        set subgroup 1
+        set community_id $community_selected
+        # If we reuse the cards we have to do the next actions, otherwise notihing to do
+        if {$reuse_parent_cards eq 1} {
+                set community_id $parent_community_id
+                set community_name [cards::get_community_pretty_name -community_id $community_id]
+                append  community_name " :: " [cards::get_community_pretty_name -community_id $community_selected]              
+        }
+}
+
+# Usuari que som y url a la que estem
+set card_id [cards::get_card_id -community_id $community_id -user_id $user_id]
+set my_user_id [ad_conn user_id]
+set referer [ns_conn url]
+
+# Si no som administradors  [admin_p = 0] --> error: permis denegat 
+set admin_p [dotlrn::user_can_admin_community_p -user_id $my_user_id -community_id $community_id]
+if {!$admin_p} {
+                        ad_return_error [lang::util::localize "#acs-subsite.Error#"] [lang::util::localize "#dotlrn.deniedpermission#"]         
+}
+
+set datetime [clock_to_ansi [clock seconds]]
+
+#db_multirow comments select_comment { *SQL* } 
+
+
+#if {$mode ne "comment_edit"} {
+#       set comment_id ""
+#       set mode ""
+#}
+#template::multirow append usercomm $names $quota $max_quota $files $max_files
+
+set contador 0
+set block_gradep 0
+set nota_final 0
+set grade_state 1
+
+
+db_multirow blocks select_blocks { *sql* }
+multirow foreach blocks {        
+        set contador [expr $contador + 1]
+        set block_grade 0.00
+        set task_num 0
+        set gradep 0.00
+        db_multirow block_task select_block_tasks {     *sql* }
+        multirow foreach block_task {        
+          set task_ctrl [db_0or1row task_note { *sql* }]
+          if {$task_ctrl eq 1} {                
+                if {$is_active eq "t"} {                
+                        set gradep [expr $grade * 10 / $max_grade]                      
+                        if {$task_percent > 0 & $type eq 3} {
+                                set gradep [expr $gradep * $task_percent / 100]
+                        }
+                        set block_grade [expr $block_grade + $gradep]
+                        set task_num [expr $task_num + 1]
+                }
+                template::multirow append grades $note_id $ref_card $task_name $task_percent $date $date_mod \
+                $note_comment $grade $gradep $max_grade $is_active $ref_percent $type                           
+          }
+        }
+        if {$type ne 3 && $task_num > 0} {
+                set block_grade [expr $block_grade / $task_num]
+        }
+        if {$block_grade < $rvalor} { #Si no superamos la restricci�n
+                set grade_avg 1
+                set grade_state 0
+        } else {
+                set grade_avg 0
+        }
+        set block_gradep [expr $block_grade * $percent / 100]
+        set nota_final [expr $nota_final + $block_gradep]
+        template::multirow append block $percent_id $percent_name $type $percent $rvalor $block_grade $block_gradep $grade_avg
+}
+
+if {($grade_state == 0) && $nota_final >= 5} {
+                set nota_final  "4*"    
+        } else {
+                if {$nota_final <= 0} {
+                                set nota_final "NP"
+                }
+}       
+
+if {$mode ne "note_edit"} {
+ set mode ""
+        set note_id ""
+} else {
+        set note_id $nid
+}
+
+
Index: openacs-4/packages/cards/www/grades.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/grades.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/grades.xql	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<queryset>
+    <rdbms><type>postgresql</type><version>7.1</version></rdbms>        
+
+        <fullquery name="select_comment">
+        <querytext>
+                        select * from card_comment 
+                        where ref_card = :card_id and
+                        ref_community = :community_id
+            </querytext>
+    </fullquery>                
+        
+        <fullquery name="select_found_card">
+                <querytext>
+                        select * from card 
+                        where ref_user= :user_id and ref_community= :community_id
+                </querytext>
+        </fullquery>    
+
+        <fullquery name="select_blocks">
+                <querytext>
+                        select * from card_percent where ref_community= :community_id order by percent desc
+                </querytext>
+        </fullquery>    
+
+
+        <fullquery name="select_block_tasks">
+                <querytext>
+                        select * from card_task where ref_percent= :percent_id and ref_community = :community_id order by task_name
+                </querytext>
+        </fullquery>    
+
+        <fullquery name="task_note">
+                <querytext>
+                        select * from card_note 
+                        where ref_card= :card_id and ref_task= :task_id
+                </querytext>
+        </fullquery>            
+        
+
+</queryset>
+
+                        
Index: openacs-4/packages/cards/www/grades_list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/grades_list.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/grades_list.adp	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,37 @@
+<if @mode@ ne "list"><master></if>
+<else>
+<link rel="stylesheet" type="text/css" href="/resources/acs-templating/lists.css" media="all" />
+</else>
+<link rel="stylesheet" href="cards.css" type="text/css">
+
+
+
+<div class="all">
+<!-- CABECERA -->
+<div class="comm">@community_name@</div>
+<div class="back">
+        <A HREF="cards_list" class="back">#cards.card_Back#</A>
+</div>
+<div class="spacer">&nbsp;</div>
+<div class="title">#cards.card_Grades_list#</div>
+
+<listtemplate name="list_grades"></listtemplate>
+<P><SPAN class="cursive">@student:rowcount@ #cards.card_Students#  &nbsp;&nbsp;&nbsp;&nbsp;</SPAN>
+<SPAN class="underline">#cards.card_Passed#</SPAN>: <SPAN class="bold">@passed@ &nbsp;&nbsp;&nbsp;&nbsp;</SPAN>
+<SPAN class="underline">#cards.card_Not_passed#</SPAN>: <SPAN class="bold">@not_passed@&nbsp;&nbsp;&nbsp;&nbsp;</SPAN>
+<SPAN class="underline">#cards.card_Not_done#</SPAN>: <SPAN class="bold">@not_presented@</SPAN>
+<BR><BR>       
+<if @mode@ ne "list">
+        <form name="gt" action="" method="post">
+        <input type="hidden" name="mode" value="csv">
+        <INPUT type="submit" value="#cards.generate_csv#">&nbsp;&nbsp;&nbsp;&nbsp;
+        <INPUT type="button" value="#cards.print_version#"      onclick="location.href='grades_list?mode=list'">
+        <BR><BR>
+#cards.card_Without_academic_validity#
+        </form>
+</if>
+       
+
+</div>
+<BR><BR>
+<!--<if error@><SCRIPT>alert("@msg_error")</SCRIPT></if>-->
Index: openacs-4/packages/cards/www/grades_list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/grades_list.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/grades_list.tcl	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,179 @@
+ad_page_contract {
+}  -query {     
+  {nav_sel:optional ""}
+  {order:optional last_name}
+  {order_dir:optional asc}
+  {mode:optional ""}  
+} -properties { 
+        block:multirow
+        grades:multirow
+}
+
+#template::multirow create block percent_id percent_name type percent rvalor block_grade block_gradep
+template::multirow create grades num user_id note_id nom
+
+#set l_alum_grades [list]
+set error 0
+# Declaraci� de variables
+set widthheight_param "width=72 height=90"
+set export_vars [export_url_vars user_id]
+# acs_user::get -user_id $user_id -array user_info
+set existe_photo 1
+set subsite_url [subsite::get_element -element url]
+set is_edit 0
+
+# Grade Stats
+set passed 0
+set not_passed 0
+set not_presented 0
+
+
+# Comunitat a la que estem. Check if we are in a subcommunity. In this case, we use the big parent community.
+# but we only show the user cards that are in subgroup
+# Community and big parent community
+set community_selected [dotlrn_community::get_community_id]
+set community_name [cards::get_community_pretty_name -community_id $community_selected]
+set parent_community_id [cards::get_big_parent_community -community_id $community_selected]
+set reuse_parent_cards [cards::get_community_parameter -community_id $community_selected -param "ReuseParentCards"]
+if {$community_selected == $parent_community_id} {
+        set subgroup 0
+        set community_id $community_selected
+} else {
+        set subgroup 1
+        set community_id $community_selected
+        # If we reuse the cards we have to do the next actions, otherwise notihing to do
+        if {$reuse_parent_cards eq 1} {
+                set community_id $parent_community_id
+                set community_name [cards::get_community_pretty_name -community_id $community_id]
+                append  community_name " :: " [cards::get_community_pretty_name -community_id $community_selected]              
+        }
+}
+# Usuari que som y url a la que estem
+#set card_id [cards::get_card_id -community_id $community_id -user_id $user_id]
+set my_user_id [ad_conn user_id]
+set referer [ns_conn url]
+
+# Si no som administradors  [admin_p = 0] --> error: permis denegat 
+set admin_p [dotlrn::user_can_admin_community_p -user_id $my_user_id -community_id $community_id]
+if {!$admin_p} {
+                        ad_return_error [lang::util::localize "#acs-subsite.Error#"] [lang::util::localize "#dotlrn.deniedpermission#"]         
+}
+
+set datetime [clock_to_ansi [clock seconds]]
+
+
+# Obtenemos la lista de bloques de la comunidad y ampliamos el multirow
+db_multirow block_list select_blocks { *SQL* }
+multirow foreach block_list {
+  # eval "template::multirow extend grades " $percent_name ==> CAMBIO 
+  eval "template::multirow extend grades " $percent_id
+  #  " " $ percent_name "_p"  
+}
+template::multirow extend grades final_grade
+
+
+if {$community_id ne $community_selected} {
+        db_multirow student select_sc_estudents_info { *SQL* }
+} else { 
+        db_multirow student select_students_info { *SQL* }
+}
+
+db_multirow block_grades select_block_grades { *SQL* }
+set num_alumne 1
+multirow foreach student {
+  set grade_final 0
+  set grade_block 0
+  set grade_block_p 0
+  set grade_state 1
+  set nom ""
+  # A�adimos al multirow User_Id - Card_Id - Nombre del Alumno
+  template::multirow append grades $num_alumne $user_id $card_id [append nom $last_name ", " $first_names]
+  set num_alumne [expr $num_alumne + 1]
+  set num [template::multirow size grades]
+  multirow foreach block_grades {
+        
+          set grade_block ""
+          set grade_block_p ""
+          set grade_block_value ""
+        if {$ref_card == $card_id} {
+          set grade_block [expr $nota_bloque * 1.00 / $nt]        
+          #append grade_block $nota_bloque " - " $nt " - " $xcent
+          set grade_block_p [expr $grade_block * $xcent /100.00]
+          #set grade_block_p $grade_block
+          if {$grade_block < $rvalor} {
+                set grade_state 0
+          }
+          set grade_final [expr $grade_final + $grade_block_p]
+          # A�adimos al multirow la informaci�n del bloque
+          # set column $percent_name  ==> MOD: vamos a utilizar ref_percent 
+          set column $ref_percent
+          append grade_block_value [format "%2.2f" $grade_block] " (" [format "%2.2f" $grade_block_p]  ")"
+          template::multirow set grades $num $column $grade_block_value
+          #append column "_p"
+          #template::multirow set grades $ num $ column $ grade_block_p
+        }
+  }
+  set grade_final [format "%2.2f" $grade_final]  
+  if {($grade_state == 0) && $grade_final >= 5} {
+        set grade_final  "4*"   
+        set not_passed [expr $not_passed + 1]   
+  } else {
+        if {$grade_final <= 0} {
+          set grade_final "NP"
+          set not_presented [expr $not_presented + 1]
+        } else {
+                if {$grade_final >= 5} {
+                        set passed [expr $passed + 1]
+                } else {
+                        set not_passed [expr $not_passed + 1]
+                }
+        }
+  }
+  
+  # A�adimos al multirow la nota final
+  template::multirow set grades $num final_grade $grade_final
+}  
+
+# LIST TEMPLATE         
+# Preparaci�n
+set elements [list num [list label "&nbsp;"]]
+lappend elements nom [list label "#dotlrn.First_Name#"]
+
+multirow foreach block_list {
+        # lappend elements $percent_name \ ==> CAMBIO
+        lappend elements $percent_id \
+        [list label $percent_name ]
+#       lappend elements $ {percent_name}_p \
+        [list label $ {percent_name}_p  ]
+}
+
+lappend elements final_grade [list label "#cards.card_Final_grade#"]
+
+
+if {$mode eq "list"} {
+        template::list::create \
+                -name list_grades \
+                -multirow grades \
+                -key card_id \
+                -class "list_to_print" \
+                -elements $elements
+} else {
+        if {$mode eq "csv"} {   
+                template::list::create \
+                -name list_grades \
+                -multirow grades \
+                -key card_id \
+                -elements $elements\
+                -selected_format csv -formats {
+                        csv { output csv }
+                }
+                template::list::write_output -name list_grades  
+                
+                } else {
+                        template::list::create \
+                        -name list_grades \
+                        -multirow grades \
+                        -key card_id \
+                        -elements $elements
+        }
+}
Index: openacs-4/packages/cards/www/grades_list.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/grades_list.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/grades_list.xql	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,112 @@
+<?xml version="1.0"?>
+
+<queryset>
+    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+    
+    <fullquery name="select_students_info">
+        <querytext>
+                        select acs_users_all.user_id as user_id,
+                                        card_id,
+                                        last_name,
+                                        first_names,
+                                        email
+                        from    acs_users_all,
+                                        dotlrn_member_rels_approved 
+                                                inner join card on (ref_user = user_id) 
+                        where dotlrn_member_rels_approved.community_id = :community_id and 
+                                        dotlrn_member_rels_approved.user_id = acs_users_all.user_id and 
+                                        (role='student' or role='member') and 
+                                        card.ref_community = community_id 
+                        order by $order $order_dir      
+        </querytext>
+    </fullquery>
+
+        <fullquery name="select_sc_estudents_info">
+                <querytext>
+                        select 
+                                acs_users_all.user_id as user_id,
+                                card_id,
+                                last_name,
+                                first_names,
+                                email
+                        from
+                                acs_users_all,
+                                dotlrn_member_rels_approved 
+                        inner join 
+                                card on (ref_user = user_id) 
+                        where 
+                                dotlrn_member_rels_approved.community_id = :community_id and 
+                                dotlrn_member_rels_approved.user_id = acs_users_all.user_id and 
+                                (role='student' or role='member') and 
+                                card.ref_community = :community_id and 
+                                acs_users_all.user_id in (
+                                        select acs_users_all.user_id 
+                                        from acs_users_all, dotlrn_member_rels_approved 
+                                        where 
+                                                dotlrn_member_rels_approved.community_id = :community_selected and 
+                                                dotlrn_member_rels_approved.user_id = acs_users_all.user_id and 
+                                                (role='student' or role='member')
+                                ) 
+                        order by $order $order_dir      
+        </querytext>
+    </fullquery>
+                
+        
+        <fullquery name="select_found_card">
+                <querytext>
+                        select * from card 
+                        where ref_user= :user_id and ref_community= :community_id
+                </querytext>
+        </fullquery>    
+
+        <fullquery name="select_blocks">
+                <querytext>
+                        select * from card_percent where ref_community= :community_id 
+                                                and percent > 0 order by percent desc
+                </querytext>
+        </fullquery>    
+
+
+        <fullquery name="select_block_tasks">
+                <querytext>
+                        select * from card_task where ref_percent= :percent_id and ref_community = :community_id order by task_name
+                </querytext>
+        </fullquery>    
+
+        <fullquery name="task_note">
+                <querytext>
+                        select * from card_note 
+                        where ref_card= :card_id and ref_task= :task_id
+                </querytext>
+        </fullquery>    
+
+        
+        <fullquery name="select_block_grades_OLD">
+                <querytext>
+                        select ref_card,ref_percent, CASE WHEN type=3 THEN '1' ELSE count(task_id) END as nt, CASE WHEN type = 3 THEN sum(grade*task_percent/(max_grade*10.00)) ELSE sum(grade*10.00/(max_grade)) END as nota_bloque, percent as xcent, rvalor, percent_name from card_note inner join (card_task inner join card_percent on (ref_percent = percent_id)) on (ref_task = task_id) where is_active = 't' group by ref_percent,ref_card, type, percent, rvalor, percent_name order by ref_card
+                </querytext>
+        </fullquery>    
+   
+        <fullquery name="select_block_grades">
+                <querytext>
+                        select ref_card,
+                               ref_percent,
+                               CASE WHEN type=3 THEN '1' ELSE count(task_id) END as nt,
+                               CASE WHEN type = 3 THEN sum(grade*task_percent/(max_grade*10.00)) ELSE sum(grade*10.00/(max_grade)) END as nota_bloque,
+                               percent as xcent,
+                               rvalor,
+                               percent_name
+                       from card_note cn, card_task ct, card_percent cp
+                       where ct.ref_percent = cp.percent_id and
+                             ct.ref_community = cp.ref_community and
+                             ct.ref_community = cn.ref_community and
+                             cn.ref_community = :community_id and
+                             cn.ref_task = ct.task_id and
+                             is_active = 't' group by ref_percent,ref_card, type, percent, rvalor, percent_name order by ref_card
+                </querytext>
+        </fullquery>
+        
+</queryset>
+
+
+
Index: openacs-4/packages/cards/www/grades_student.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/grades_student.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/grades_student.adp	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,64 @@
+<link rel="stylesheet" href="cards.css" type="text/css">
+
+
+<div class="spacer">&nbsp;</div>
+<TABLE class="uv_table1" summary="#cards.summary_card_grades#">
+        <tr>
+        <th colspan="3">#cards.card_Grades_list#</th>
+        <th colspan="4" class="final_grade">#cards.card_Average_grade#: 
+        <if @nota_final@ ne "NP" and @nota_final@ ne "4*"><%= [format "%2.2f" @nota_final@] %></if>
+        <else>@nota_final@</else>
+        </th>
+  </tr>
+
+<!--  ****************  MOSTRAR - NOTAS ALUMNO *************** -->
+<if @block:rowcount@ eq 0>
+#cards.card_No_notes#
+</if>
+<else>
+<multiple name="block">
+<if @nav_sel@ eq @block.percent_id@ or @nav_sel@ eq "">
+  <tr class="list-header">
+        <th colspan="3" class="block">&nbsp;<B>@block.percent_name@</B> (@block.percent@%)
+        <if @block.rvalor@ gt 0>&nbsp;[>= @block.rvalor@] </if>
+        </th>
+        <th colspan="4" align="right" class="block_avg"><B>&nbsp;#cards.avg#: 
+           <%= [format "%2.2f" @block.block_grade@] %></B>
+          (<%= [format "%2.2f" @block.block_gradep@] %>)</th>
+  </tr>   
+  <tr class="list-odd" height="6">
+        <th width="21%" class="uv_cell">#cards.card_Note#</th>
+        <th width="9%" class="uv_cell">#cards.card_Date#</th>
+        <th width="45%" class="uv_cell">#cards.card_Comment#</th>
+        <th width="13%" class="uv_cell" colspan="3">#cards.card_Grade#</th>
+        <th width="3%" class="uv_cell">#cards.card_Active#</th>                  
+  </tr>
+  <multiple name="grades">
+        <if @grades.ref_percent@ eq @block.percent_id@>   
+          <tr class="list-even" onmouseover="javascript:style.backgroundColor='#99ccff'" 
+          onmouseout="javascript:style.backgroundColor='#FFFFFF'">
+                <td width="21%" class="uv_cell">@grades.task_name@ 
+                <if @grades.type@ eq 3>[@grades.task_percent@%]</if></td>
+       <td width="9%" class="uv_cell"><%= [string range [format "%s" @grades.date_mod@] 0 15] %></td>
+           <td width="45%" class="uv_cell">&nbsp;@grades.note_comment@</td>
+           <td width="13%" class="uv_cell" align="right" colspan="3">
+           <B>@grades.grade@ / @grades.max_grade@&nbsp;</B></td>
+           <td width="3%" class="uv_cell">
+       <if @grades.is_active@>
+       <INPUT type="checkbox" size="1" name="noteact" checked disabled>
+       </if><else>
+       <INPUT type="checkbox" size="1" name="noteact" disabled>
+       </else>                         
+      </td>                   
+        </if>
+        </tr>
+  </multiple>
+</if>   
+</multiple>
+</else>
+<TR>
+<TD COLSPAN="7" align="right">#cards.grade_alert# - #cards.card_Without_academic_validity#
+</TD>
+</TR>
+</table>
+<BR>
Index: openacs-4/packages/cards/www/grades_student.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/grades_student.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/grades_student.tcl	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,83 @@
+ad_page_contract {
+}  -query {     
+  user_id:integer,notnull
+  {nav_sel:optional ""}
+} -properties { 
+        block:multirow
+        grades:multirow
+}
+
+template::multirow create block percent_id percent_name type percent rvalor block_grade block_gradep
+template::multirow create grades note_id ref_card task_name task_percent date date_mod note_comment grade gradep max_grade is_active ref_percent type
+
+
+# Declaraci� de variables
+set widthheight_param "width=72 height=90"
+set export_vars [export_url_vars user_id]
+acs_user::get -user_id $user_id -array user_info
+set existe_photo 1
+set subsite_url [subsite::get_element -element url]
+set is_edit 0
+
+# Comunitat a la que estem. Check if we are in a subcommunity. In this case, we use the big parent community.
+# but we only show the user cards that are in subgroup
+set community_id [dotlrn_community::get_community_id]
+set community_selected $community_id
+set community_id [cards::get_big_parent_community -community_id $community_id]
+
+# Usuari que som y url a la que estem
+set card_id [cards::get_card_id -community_id $community_id -user_id $user_id]
+set my_user_id [ad_conn user_id]
+set referer [ns_conn url]
+
+set datetime [clock_to_ansi [clock seconds]]
+
+set contador 0
+set block_gradep 0
+set nota_final 0
+set grade_state 1
+
+
+db_multirow blocks select_blocks { *sql* }
+multirow foreach blocks {        
+        set contador [expr $contador + 1]
+        set block_grade 0.00
+        set task_num 0
+        set gradep 0.00
+        db_multirow block_task select_block_tasks {     *sql* }
+        multirow foreach block_task {     
+          set task_ctrl [db_0or1row task_note { *sql* }]
+          if {$task_ctrl eq 1} {                                
+                if {$is_active eq "t"} {                
+                        set gradep [expr $grade * 10 / $max_grade]                      
+                        if {$task_percent > 0 & $type eq 3} {
+                                set gradep [expr $gradep * $task_percent / 100]
+                        }
+                        set block_grade [expr $block_grade + $gradep]
+                        set task_num [expr $task_num + 1]
+                }
+                template::multirow append grades $note_id $ref_card $task_name $task_percent $date $date_mod \
+                $note_comment $grade $gradep $max_grade $is_active $ref_percent $type                           
+          }
+        }
+        if {$type ne 3 && $task_num > 0} {
+                set block_grade [expr $block_grade / $task_num]
+        }
+        if {$block_grade < $rvalor} { #Si no superamos la restricci�n
+                set grade_avg 1
+                set grade_state 0
+        } else {
+                set grade_avg 0
+        }
+        set block_gradep [expr $block_grade * $percent / 100]
+        set nota_final [expr $nota_final + $block_gradep]       
+        template::multirow append block $percent_id $percent_name $type $percent $rvalor $block_grade $block_gradep $grade_avg
+}
+
+if {($grade_state == 0) && $nota_final >= 5} {
+        set nota_final  "4*"    
+} else {
+        if {$nota_final <= 0} {
+                        set nota_final "NP"
+        }
+}       
Index: openacs-4/packages/cards/www/grades_student.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/grades_student.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/grades_student.xql	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<queryset>
+    <rdbms><type>postgresql</type><version>7.1</version></rdbms>        
+        
+
+
+        <fullquery name="select_comment">
+        <querytext>
+                        select * from card_comment 
+                        where ref_card = :card_id and
+                        ref_community = :community_id
+            </querytext> 
+    </fullquery>                
+        
+        <fullquery name="select_found_card">
+                <querytext>
+                        select * from card 
+                        where ref_user= :user_id and ref_community= :community_id
+                </querytext>
+        </fullquery>    
+
+        <fullquery name="select_blocks">
+                <querytext>
+                        select * from card_percent where ref_community= :community_id order by percent desc
+                </querytext>
+        </fullquery>    
+
+
+        <fullquery name="select_block_tasks">
+                <querytext>
+                        select * from card_task where ref_percent= :percent_id and ref_community = :community_id order by task_name
+                </querytext>
+        </fullquery>    
+
+        <fullquery name="task_note">
+                <querytext>
+                        select * from card_note 
+                        where ref_card= :card_id and ref_task= :task_id
+                </querytext>
+        </fullquery>            
+        
+
+</queryset>
+
+                        
Index: openacs-4/packages/cards/www/list-photos.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/list-photos.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/list-photos.adp	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,45 @@
+<if @mode@ ne "list">
+<MASTER>
+</if>
+
+<link rel="stylesheet" href="cards.css" type="text/css">
+
+<!-- CABECERA -->
+<DIV width="100%">
+<div class="comm">#cards.card_Orla#: @community_name@</div>
+<div class="back">
+        <A HREF="cards_list" class="back">#cards.card_Back#</A>
+</div>
+
+<div class="spacer">&nbsp;</div>
+
+
+<div class="container">
+        <multiple name="photos">
+<!--
+<%= [set idx [expr @photos.rownum@ % 7]] 
+        set idx @idx@
+%>
+-->
+        <if @idx@ eq 0>         
+                <div class="float">
+                        @photos.student;noquote@
+                </div>          
+                <div class="spacer">&nbsp;</div>
+        </if>
+        <else>
+                <div class="float">
+                        @photos.student;noquote@
+                </div>
+        </else>
+        </multiple>
+        <div class="spacer">&nbsp;</div>
+</div>
+
+<if @mode@ ne "list">
+<a href="list-photos?mode=list">#cards.print_version#</a>
+</if>
+<if @error@><SCRIPT>alert("@msg_error@")</SCRIPT>
+</if>
+
+
Index: openacs-4/packages/cards/www/list-photos.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/list-photos.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/list-photos.tcl	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,70 @@
+ad_page_contract {
+}  -query {
+  {mode:optional ""}
+  {order:optional last_name}
+  {order_dir:optional asc}
+} -properties { 
+        photos:multirow
+}
+
+set dotlrn_url [dotlrn::get_url]
+set my_user_id [ad_conn user_id]
+set referer [ns_conn url]
+set widthheight_param "width=72 height=90"
+template::multirow create photos student
+set error 0
+set msg_error ""
+
+# Comunitat a la que estem. Check if we are in a subcommunity. In this case, we use the big parent community.
+# but we only show the user cards that are in subgroup
+# Community and big parent community
+set community_selected [dotlrn_community::get_community_id]
+set community_name [cards::get_community_pretty_name -community_id $community_selected]
+set parent_community_id [cards::get_big_parent_community -community_id $community_selected]
+set reuse_parent_cards [cards::get_community_parameter -community_id $community_selected -param "ReuseParentCards"]
+if {$community_selected == $parent_community_id} {
+        set subgroup 0
+        set community_id $community_selected
+} else {
+        set subgroup 1
+        set community_id $community_selected
+        # If we reuse the cards we have to do the next actions, otherwise notihing to do
+        if {$reuse_parent_cards eq 1} {
+                set community_id $parent_community_id
+                set community_name [cards::get_community_pretty_name -community_id $community_id]
+                append  community_name " :: " [cards::get_community_pretty_name -community_id $community_selected]              
+        }
+}
+
+# Access control
+set site_wide_admin_p [permission::permission_p \
+    -object_id [acs_magic_object security_context_root] \
+    -privilege admin \
+]
+
+if {!$site_wide_admin_p} {
+    set admin_p [dotlrn::user_can_admin_community_p -user_id $my_user_id -community_id $community_id]
+} else {
+    set admin_p 1
+}
+
+# Students Redirect to its student card
+if {!$admin_p} {
+        ad_returnredirect "student_card?user_id=$my_user_id&nav_sel=ficha"
+        }
+
+# Mostrar el listado de alumnos con ficha
+#db_multirow current_members select_students_info { *SQL* }
+ 
+                                 
+
+if {$parent_community_id ne $community_selected} {
+        db_multirow current_members select_sc_estudents_info { *SQL* }
+} else { 
+        db_multirow current_members select_students_info { *SQL* }
+}
+
+multirow foreach current_members {
+  set photo_student [cards::get_photo_orla -user_id $user_id -param $widthheight_param]
+  template::multirow append photos $photo_student       
+}
Index: openacs-4/packages/cards/www/list-photos.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/list-photos.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/list-photos.xql	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+
+<queryset>
+    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+    <fullquery name="select_students_info">
+        <querytext>
+                        select acs_users_all.user_id as user_id,
+                                        card_id,
+                                        last_name,
+                                        first_names,
+                                        email
+                        from    acs_users_all,
+                                        dotlrn_member_rels_approved 
+                                                inner join card on (ref_user = user_id) 
+                        where dotlrn_member_rels_approved.community_id = :community_id and 
+                                        dotlrn_member_rels_approved.user_id = acs_users_all.user_id and 
+                                        (role='student' or role='member') and 
+                                        card.ref_community = community_id 
+                        order by $order $order_dir      
+        </querytext>
+    </fullquery>
+        
+        
+        
+        <fullquery name="select_sc_estudents_info">
+                <querytext>
+                        select 
+                                acs_users_all.user_id as user_id,
+                                card_id,
+                                last_name,
+                                first_names,
+                                email
+                        from
+                                acs_users_all,
+                                dotlrn_member_rels_approved 
+                        inner join 
+                                card on (ref_user = user_id) 
+                        where 
+                                dotlrn_member_rels_approved.community_id = :community_id and 
+                                dotlrn_member_rels_approved.user_id = acs_users_all.user_id and 
+                                (role='student' or role='member') and 
+                                card.ref_community = :community_id and 
+                                acs_users_all.user_id in (
+                                        select acs_users_all.user_id 
+                                        from acs_users_all, dotlrn_member_rels_approved 
+                                        where 
+                                                dotlrn_member_rels_approved.community_id = :community_selected and 
+                                                dotlrn_member_rels_approved.user_id = acs_users_all.user_id and 
+                                                (role='student' or role='member')
+                                ) 
+                        order by $order $order_dir      
+        </querytext>
+    </fullquery>
+        
+</queryset>
+
+
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/cards/www/list_notes.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/cards/www/list_notes.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/cards/www/list_notes.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/cards/www/manage_blocks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/manage_blocks.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/manage_blocks.adp	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,232 @@
+<!-- <master>  -->
+<SCRIPT LANGUAGE="JavaScript">
+<!-- Original:  Paco Soler -->
+<!-- Begin
+function validaForm (f) {
+        if (f.mode.value == "cancel") {
+                f.block_name.value = "";
+                f.block_percent.value = 0;
+                f.block_rvalor.value = 0;
+                return true;
+        } else {
+        error = 0
+        if (f.block_name.value == "" || f.block_name.value == " ") {
+                f.block_name.style.backgroundColor="#ffcc00";
+                error = 1
+        } else {f.block_name.style.backgroundColor="#ffffff";}
+        if (isNaN(f.block_percent.value) || parseInt(f.block_percent.value) > 100 || parseInt(f.block_percent.value) < 0) {
+                        f.block_percent.style.backgroundColor="#ffcc00";
+                        error = 2
+        } else {f.block_percent.style.backgroundColor="#ffffff";}
+        if (isNaN(f.block_rvalor.value) || parseInt(f.block_rvalor.value) > 10 || parseInt(f.block_rvalor.value) < 0){          
+                        f.block_rvalor.style.backgroundColor="#ffcc00"
+                        error = 3                       
+        } else {f.block_rvalor.style.backgroundColor="#ffffff";}
+
+        if (error > 0) { alert ("#cards.card_Invalid_data#");return false}
+        else return true
+        }
+}       
+        
+//  End -->
+</script>
+
+<link rel="stylesheet" href="cards.css" type="text/css">
+<!-- CABECERA -->
+<DIV class="all">
+<div class="comm">@community_name@</div>
+<div class="back">
+        <A HREF="cards_list" class="back">#cards.card_Back#</A>
+</div>
+<div class="spacer">&nbsp;</div>
+
+
+<!-- TABLA DE BLOQUES-->
+  <table  class="uv_table" summary="#cards.summary_Assignments_list#">
+  <caption class="uv_table">#cards.card_Evaluation_blocks_list#</caption>
+  <tr class="uv_table_header">
+        <th class="uv_cell" width="4%">N�</th>
+        <th class="uv_cell" width="23%" title="#cards.tooltip_data_type#">#cards.card_Data_type#
+                <A HREF="manage_blocks?order=type&order_dir=asc" class="orderby" title="#cards.tooltip_orderby_asc#">
+                        <IMG SRC="icons/up.gif" alt="#cards.tooltip_orderby_asc#"></A>
+                <A HREF="manage_blocks?order=type&order_dir=desc" class="noline" title="#cards.tooltip_orderby_desc#">
+                        <IMG SRC="icons/down.gif" alt="#cards.tooltip_orderby_desc#"></A>
+        </th>
+        
+        <th class="uv_cell" width="45%">#cards.card_Block_name#
+                <A HREF="manage_blocks?order=percent_name&order_dir=asc" class="orderby" title="#cards.tooltip_orderby_asc#">
+                        <IMG SRC="icons/up.gif" alt="#cards.tooltip_orderby_asc#"></A>
+                <A HREF="manage_blocks?order=percent_name&order_dir=desc" class="noline" title="#cards.tooltip_orderby_desc#">
+                        <IMG SRC="icons/down.gif" alt="#cards.tooltip_orderby_desc#"></A>
+        </th>
+                
+        
+        <th class="uv_cell" width="8%" abbr="#cards.percent#" title="#cards.percent#">%
+                <A HREF="manage_blocks?order=percent&order_dir=asc" class="orderby" title="#cards.tooltip_orderby_asc#">
+                        <IMG SRC="icons/up.gif" alt="#cards.tooltip_orderby_asc#"></A>
+                <A HREF="manage_blocks?order=percent&order_dir=desc" class="noline" title="#cards.tooltip_orderby_desc#">
+                        <IMG SRC="icons/down.gif" alt="#cards.tooltip_orderby_desc#"></A>               
+        </th>           
+        <th class="uv_cell" width="8%" abbr="#cards.restriction#" title="#cards.restriction#"><B>R[>=]</B></th> 
+        <if @mode@ eq "edit">
+        <th class="uv_cell" width="6%">#cards.card_Accept#</th>
+        <th class="uv_cell" width="6%">#cards.card_Cancel#</th> 
+        </if><else>
+        <th class="uv_cell" width="6%">#cards.card_Edit#</th>
+        <th class="uv_cell" width="6%">#cards.card_Delete#</th> 
+        </else>
+  </tr>
+        
+  <!-- LLISTEM ELS BLOCS DE LA COMUNITAT -->
+  <multiple name="block">
+  <!-- SI EL BLOC ACTUAL ES EDITAT -->
+  <if @block.percent_id@ eq @block_sel_edit@> 
+  <tr class="uv_cell_insert">
+        <td class="uv_cell_insert" width="4%" align="center">@block.rownum@</td>        
+        <FORM METHOD="post" name="fe" onSubmit ="return validaForm(this)">
+        <INPUT type="hidden" name="block_id" value="@block.percent_id@">                
+        <!--  ********* type  **********-->             
+        <td width="23%" class="uv_cell_insert">
+          <SELECT name="block_type">
+          <!--<if block.type eq 1><OPTION selected value="1"></if><else><OPTION value="1"></else>�nica</OPTION> -->
+          <if @block.type@ eq 1><OPTION selected value="1"></if>
+                <else><OPTION value="1"></else>B�sicas</OPTION> 
+          <if @block.type@ eq 2><OPTION selected value="2"></if>
+                <else><OPTION value="2"></else>Seleccionables</OPTION>          
+          <if @block.type@ eq 3><OPTION selected value="3"></if>
+                <else><OPTION value="3"></else>Ponderadas</OPTION>              
+          </SELECT></td>
+        <!--  ********* name  **********-->
+        <td width="45%" class="uv_cell_insert" >
+          <INPUT class="edit" type="text" size="50" name="block_name" value="@block.percent_name@"></td>
+        <!--  ********* %  **********-->
+        <td width="8%" align="center" class="uv_cell_insert">
+          <INPUT type="text" size="5" name="block_percent" value="@block.percent@">
+                </TD>
+        <!--  *********  <=  **********-->                                              
+        <td width="8%" align="center" class="uv_cell_insert">
+          <INPUT type="text" size="5" name="block_rvalor" value="@block.rvalor@">
+        <!--  *********  BOTONES  **********-->                                         
+        <td width="6%" class="uv_cell_insert" align="center">           
+                <INPUT type="hidden" name="mode" value="">
+                <INPUT type="hidden" name="block_type_old" value="@block.type@">
+                <INPUT type="hidden" name="order" value="@order@">
+                <INPUT type="hidden" name="order_dir" value="@order_dir@">
+                <INPUT type="image" name="submit" value="submit" size="10" src="icons/ok.gif" 
+                ALT="#cards.tooltip_save_changes#" title="#cards.tooltip_save_changes#" 
+                onclick="document.fe.mode.value='update'">              
+                
+        <td width="6%" class="uv_cell_insert" align="center">
+                <INPUT type="image" name="submit" value="submit" size="10" 
+                title="#cards.tooltip_discard_changes#" src="icons/ko.gif" 
+                ALT="#cards.tooltip_discard_changes#"  onclick="document.fe.mode.value='cancel'"></td>
+        </FORM>
+        </if><else> <!-- SI LA ASIGNACION ACTUAL NO ES LA EDITADA -->
+          <if @block.rownum@ odd>       
+                <tr class="list-odd" onmouseover="javascript:style.backgroundColor='#99ccff'" onmouseout="javascript:style.backgroundColor='#EAF2FF'">
+          </if><else>
+                <tr class="list-even" onmouseover="javascript:style.backgroundColor='#99ccff'" onmouseout="javascript:style.backgroundColor='#FFFFFF'">
+          </else>                               
+        <td class="uv_cell" width="4%" align="center">@block.rownum@</td>                               
+        <td width="23%" class="uv_cell">
+        <if @block.type@ eq 1>B�sicas</if><if @block.type@ eq 2>Seleccionables</if>
+        <if @block.type@ eq 3>Ponderadas</if></td>
+        <td width="45%" class="uv_cell">@block.percent_name@</td>
+        <td width="8%" align="center" class="uv_cell" >@block.percent@</td>
+        <td width="8%" align="center" class="uv_cell" >@block.rvalor@</td>
+        <!-- MODE EDIT LINK **************************************************-->       
+        <FORM METHOD="post" name="fm" class="p">
+        <td width="6%"  height="auto" class="uv_cell" align="center">
+                <if @is_edit@ ne 1>
+                <INPUT type="hidden" name="block_id" value="@block.percent_id@">
+                <INPUT type="hidden" name="mode" value="edit">
+                <INPUT type="hidden" name="order" value="@order@">
+                <INPUT type="hidden" name="order_dir" value="@order_dir@">
+                <INPUT type="image" name="submit" value="submit" border="0" alt="#cards.card_Edit#" title="#cards.card_Edit# #cards.card_Block#" src="icons/edit.gif" style="margin:0;padding:0">               
+                </if></td></form>
+        <!-- MODE DELETE LINK ****************************************************-->
+        <FORM METHOD="post" name="fd" style="height:5px;vertical-align:middle">
+        <td width="6%" class="uv_cell" align="center">
+                <if @is_edit@ ne 1>
+                <INPUT type="hidden" name="block_id" value="@block.percent_id@">
+                <INPUT type="hidden" name="mode" value="delete">
+                <INPUT type="hidden" name="order" value="@order@">
+                <INPUT type="hidden" name="order_dir" value="@order_dir@">
+                <INPUT type="image" name="submit" value="submit" border="0" title="#cards.card_Delete# #cards.card_Block#"
+                alt="#cards.card_Delete# #cards.card_Block#" src="icons/papelera.gif" style="margin:0;padding:0"
+                onclick="return confirm('#cards.card_del_bloc1# @block.percent_name@ #cards.card_del_bloc2#')">         
+                </if></td></form>               
+        </else>
+        </tr>
+        </multiple>     
+
+<!-- Aqui va una fila para INSERTAR tipos a no ser que estemos en edici�n-->
+<if @mode@ ne "edit">
+        <FORM METHOD="post" name="fi" onSubmit = "return validaForm(this)">
+        <!-- <INPUT type="hidden" name="asig_id" value="update">  No estoy seguro de que haga falta -->
+        <tr class="uv_cell_insert">
+                <td width="4%" align="center" class="uv_cell_insert"><span class="big">*</span></td>
+                <td width="23%" class="uv_cell_insert">
+                        <SELECT name="block_type">
+                                <OPTION value="1">B�sicas</OPTION>                              
+                                <OPTION value="2">Seleccionables</OPTION>       
+                                <OPTION value="3">Ponderadas</OPTION>           
+                        </SELECT></td>
+                <td width="45%" class="uv_cell_insert">
+                        <INPUT type="text" size="55" name="block_name" value="@block_name@"></td>
+                <td width="8%" align="center" class="uv_cell_insert">
+                        <INPUT type="text" size="5" name="block_percent" value="@block_percent@"></td>
+                <td width="8%" align="center" class="uv_cell_insert">
+                        <INPUT type="text" size="5" name="block_rvalor" value="@block_rvalor@"></td>                    
+                <td width="6%" colspan="2" class="uv_cell_insert"><CENTER>
+                        <INPUT type="hidden" name="mode" value="insert">
+                        <INPUT type="hidden" name="order" value="@order@">
+                        <INPUT type="hidden" name="order_dir" value="@order_dir@">                      
+                        <INPUT type="image" name="submit" value="submit" border="0" 
+                                title="#dotlrn.New# #cards.card_Block#"  ALT="#dotlrn.New# #cards.card_Block#" 
+                                src="icons/plus.gif" style="margin:0;padding:0"></CENTER></td>  
+        </tr></form>    
+
+
+<!-- OPCIONES CONFIRUGACI�N-->
+
+
+</if>
+        </TABLE>
+<if @total@ gt 100><h4 class="total"><U>#cards.card_Total_assigned#</U>:<SPAN class="alert">@total@</span> / 100</h4>
+</if> <else>    
+<h4 class="total"><U>#cards.card_Total_assigned#</U>: @total@ / 100</h4>
+</else>
+<div class="spacer">&nbsp;</div>
+
+<UL>
+<LI class="config_item"> #cards.card_Allow_students_access#:&nbsp;
+        <SPAN CLASS="yes">
+        <if @allow_view_grades@ eq 1>
+                #cards.yes# | <A HREF="manage_blocks?mode=allow&alum_view=0">#cards.no#</A>
+        </if><else>
+                <A HREF="manage_blocks?mode=allow&alum_view=1">#cards.yes#</A> | #cards.no# 
+        </else>
+        </SPAN>
+<if @subgroup@ eq 1>
+<LI class="config_item"> #cards.card_reuse_parent_cards#:&nbsp;
+        <SPAN CLASS="yes">
+        <if @reuse_parent_cards@ eq 1>
+                #cards.yes# | <A HREF="manage_blocks?mode=reuse&reuse_cards=0">#cards.no#</A>
+        </if><else>
+                <A HREF="manage_blocks?mode=reuse&reuse_cards=1">#cards.yes#</A> | #cards.no# 
+        </else>
+        </SPAN>
+</if>   
+</UL>
+
+<BR><BR>
+<if @error@>
+<SCRIPT>
+eval ("@cambia@")
+eval("@senyala@" + "'#ffcc00'")
+alert("@msg_error@")
+
+
+</SCRIPT>
+</if>
Index: openacs-4/packages/cards/www/manage_blocks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/manage_blocks.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/manage_blocks.tcl	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,200 @@
+ad_page_contract {
+}  -query {  
+  {mode:optional ""}
+  {block_id:integer,optional ""}
+  {block_type:integer,optional ""}
+  {block_type_old:integer,optional ""}
+  {block_name:optional ""}  
+  {block_percent:integer,optional 0}  
+  {block_rvalor:float,optional 0}    
+  {order:optional percent}
+  {order_dir:optional desc}  
+  {alum_view:integer,optional 0} 
+  {reuse_cards:integer,optional 0} 
+} -properties {
+}
+
+# Declaraci� de variables a emprar
+set error 0
+set msg_error ""
+set link_url ""
+set block_sel_edit ""
+set is_edit 0
+set total 0
+set total_p 0
+
+
+
+# Community and big parent community
+set community_selected [dotlrn_community::get_community_id]
+set community_name [cards::get_community_pretty_name -community_id $community_selected]
+set parent_community_id [cards::get_big_parent_community -community_id $community_selected]
+set reuse_parent_cards [cards::get_community_parameter -community_id $community_selected -param "ReuseParentCards"]
+set allow_view_grades [cards::get_community_parameter -community_id $community_selected -param "AllowGradeView"] 
+
+if {$community_selected == $parent_community_id} {
+        set subgroup 0
+        set community_id $community_selected
+} else {
+        set subgroup 1
+        set community_id $community_selected
+        # If we reuse the cards we have to do the next actions, otherwise notihing to do
+        if {$reuse_parent_cards eq 1} {
+                set community_id $parent_community_id
+                set community_name [cards::get_community_pretty_name -community_id $community_id]
+                append  community_name " :: " [cards::get_community_pretty_name -community_id $community_selected]
+        }
+}
+
+
+
+
+
+# Usuari que som y url a la que estem
+set my_user_id [ad_conn user_id]
+set referer [ns_conn url]
+
+# Si no som administradors  [admin_p = 0] --> error: permis denegat 
+set admin_p [dotlrn::user_can_admin_community_p -user_id $my_user_id -community_id $community_id]
+if {!$admin_p} {
+                        ad_return_error [lang::util::localize "#acs-subsite.Error#"] [lang::util::localize "#dotlrn.deniedpermission#"]         
+}
+
+
+
+
+
+##########     MODE  ALLOW STUDENTS VIEW     ##########
+if {$mode == "allow"} {
+        cards::update_cards_parameter -community_id $community_selected -param "AllowGradeView" -value $alum_view       
+        set allow_view_grades [cards::get_community_parameter -community_id $community_selected -param "AllowGradeView"]
+}
+
+##########     MODE  REUSE PARENTs CARDS    ##########
+if {$mode == "reuse"} {
+        cards::update_cards_parameter -community_id $community_selected -param "ReuseParentCards" -value $reuse_cards   
+        ad_returnredirect "./cards_list"
+
+}
+
+##########     MODE  CANCELAR --> No fa res, redireccio a la pagina anterior     ##########
+if {$mode eq "cancel"} {
+        set mode ""
+        #ad_returnredirect "./manage_blocks?order=$order&order_dir=$order_dir"
+}
+#set msg_error "HEMOS INSERTADO"
+#set link_url "./manage_blocks?mode="
+
+##########     MODO  INSERTAR                                                  ##########
+if {$mode eq "insert"} {
+        # Comprobaci�n nombre bloque ya existe
+        set found_block [db_0or1row found_block_i { *SQL* }]
+        if {($found_block eq 0) && ($block_name ne "") && ($block_name ne " ")} {
+                if {($block_percent >= 0) && ($block_percent <= 100)} {
+                        if {($block_rvalor >= 0) && ($block_rvalor <= 10)} {
+                                db_dml insert_blocks { *SQL* } 
+                                set mode ""
+                                set block_name ""
+                                set block_type 1
+                                set block_percent 0
+                                set block_rvalor 0                              
+                                #ad_returnredirect "./manage_blocks?order=$order&order_dir=$order_dir"
+                        } else {
+                                set error 1
+                set msg_error "Valor restricci�n no v�lido"
+                                append cambia "document.fi.block_rvalor.value='" $block_rvalor "'"
+                                set senyala "document.fi.block_rvalor.style.backgroundColor="
+                        }
+                } else {
+                        set error 1
+                        set msg_error "Porcentaje no v�lido"
+                        append cambia "document.fi.block_percent.value='" $block_percent "'"
+                        set senyala "document.fi.block_percent.style.backgroundColor="
+                }        
+        } else {
+                set error 1
+        set msg_error "Nombre de bloque ya existe o es nulo"
+                append cambia "document.fi.block_name.value='" $block_name "'"
+                set senyala "document.fi.block_name.style.backgroundColor="
+        }
+
+} 
+
+##########     MODO  ACTUALIZAR                                            ##########
+if {$mode eq "update"} {
+        set found_block [db_0or1row found_block_u { *SQL* }]
+        if {($block_name ne "") && ($found_block eq 0) } {                
+                if {($block_percent >= 0) && ($block_percent <= 100)} {
+                        if {($block_rvalor >= 0) && ($block_rvalor <= 10)} {
+                                if {($block_type_old < $block_type) && ($block_type_old ==3 || $block_type ==3)} {
+                                        set new_percent 0
+                                        db_dml update_task_percent { *SQL* }
+                                } else {
+                                        if {($block_type_old > $block_type) && ($block_type_old ==3 || $block_type ==3)} {
+                                        set new_percent -1
+                                        db_dml update_task_percent { *SQL* }
+                                        }
+                                }
+                db_dml update_block { *SQL* }
+                                set mode ""
+                                set block_name ""
+                                set block_type 1
+                                set block_percent 0
+                                set block_rvalor 0
+                                #ad_returnredirect "./manage_blocks?order=$order&order_dir=$order_dir"
+                        } else {
+                                set mode edit
+                                set error 1
+                                set msg_error "Valor de restricci�n no v�lido."
+                                append cambia "document.fe.block_rvalor.value='" $block_rvalor "'"
+                                set senyala "document.fe.block_rvalor.style.backgroundColor="
+                        }
+        } else {
+                                set mode edit
+                                set error 1
+                                set msg_error "Porcentaje no v�lido."
+                                append cambia "document.fe.block_percent.value='" $block_percent "'"
+                                set senyala "document.fe.block_percent.style.backgroundColor="
+                }       
+        } else { 
+                set mode edit
+                set error 1
+        set msg_error "Nombre de bloque ya existente o no v�lido."
+                append cambia "document.fe.block_name.value='" $block_name "'"
+                set senyala "document.fe.block_name.style.backgroundColor="
+        }
+} 
+
+##########     MODO  BORRAR --> Borrado en cascada            ########## 
+if {$mode eq "delete"} {
+        set l_del_notes [db_list select_notes { *SQL* }]    
+    foreach del_i $l_del_notes {
+                # Borramos anotaciones de los alumnos de ese tipo base
+        db_dml delete_note { *SQL* }               
+    }
+        # Borramos las anotaciones de la comunidad de ese tipo base
+        db_dml delete_block_tasks { *SQL* }               
+        # Borramos el bloque b�sico
+        db_dml delete_block  { *SQL* }
+        set mode ""
+}               
+
+##########     MODO  EDITAR --> Modificar bloques ya creados    ##########
+if {$mode eq "edit"} {
+        set block_sel_edit $block_id
+        set is_edit 1
+        #db_1row t_sel { *SQL* }
+        #set sel_edit_type $type
+}
+
+
+# Obtenim la llista de blocs de la comunitat
+db_multirow block select_blocks { *SQL* } 
+db_1row total_percent { *SQL* } 
+if {$total_p > 0} {
+        set total $total_p 
+} else {
+        set total 0
+}
+
+
Index: openacs-4/packages/cards/www/manage_blocks.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/manage_blocks.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/manage_blocks.xql	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,102 @@
+<?xml version="1.0"?>
+
+<queryset>
+    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+<fullquery name="insert_blocks">
+        <querytext>
+                insert into card_percent
+                        (ref_community, type, percent_name, percent, rvalor)
+                values
+                        (:community_id, :block_type, :block_name, :block_percent, :block_rvalor)
+        </querytext>
+</fullquery>
+
+<fullquery name="select_blocks">
+        <querytext>
+                select * from card_percent where ref_community = :community_id 
+                order by $order $order_dir      
+        </querytext>
+</fullquery>
+
+
+<fullquery name="t_sel">
+        <querytext>
+                 select * from card_percent where percent_id = :block_id
+            </querytext>
+</fullquery>    
+
+
+<fullquery name="update_block">
+        <querytext>
+                update card_percent
+            set percent_name= :block_name, percent= :block_percent, 
+                                type= :block_type, rvalor= :block_rvalor
+                        where percent_id= :block_id
+        </querytext>
+</fullquery>    
+
+
+        <fullquery name="select_notes">
+        <querytext>
+                        select task_id from card_task
+                        where ref_percent = :block_id
+            </querytext>
+    </fullquery>        
+        
+
+        <fullquery name="delete_note">
+        <querytext>
+                        delete from card_note where ref_task= :del_i
+            </querytext>
+    </fullquery>        
+
+
+        <fullquery name="delete_block_tasks">
+        <querytext>
+                        delete from card_task where ref_percent= :block_id 
+            </querytext>
+    </fullquery>        
+        
+        <fullquery name="delete_block">
+        <querytext>
+                        delete from card_percent where percent_id= :block_id
+            </querytext>
+    </fullquery>                
+
+
+        <fullquery name="found_block_i">
+        <querytext>
+                        select percent_id from card_percent 
+                        where ref_community = :community_id and percent_name = :block_name
+                </querytext>
+    </fullquery>        
+        
+        <fullquery name="found_block_u">
+        <querytext>
+                        select percent_id from card_percent 
+                        where   ref_community = :community_id and 
+                                        percent_name = :block_name 
+                                        and percent_id <> :block_id
+                </querytext>
+    </fullquery>                
+
+        
+        <fullquery name="total_percent">
+        <querytext>
+                        select sum (percent) as total_p from card_percent 
+                        where   ref_community = :community_id
+                                        
+                </querytext>
+    </fullquery>
+
+        
+        <fullquery name="update_task_percent">
+        <querytext>
+                        update card_task
+            set task_percent= :new_percent
+                        where ref_percent= :block_id
+                </querytext>
+    </fullquery>        
+
+</queryset>
Index: openacs-4/packages/cards/www/manage_tasks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/manage_tasks.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/manage_tasks.adp	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,228 @@
+<!-- <master>  -->
+<SCRIPT LANGUAGE="JavaScript">
+<!-- Original:  Paco Soler -->
+<!-- Begin
+function validaForm (f) {
+  if (f.mode.value == "cancel") {
+        f.task_name.value = "";
+        f.task_percent.value = 0;
+        f.task_max_grade.value = 0;
+        return true;
+  } else {
+        error = 0
+        if (f.task_name.value == "" || f.task_name.value == " ") {
+          f.task_name.style.backgroundColor="#ffcc00";
+          error = 1
+        } else {
+          f.task_name.style.backgroundColor="#ffffff";
+        }
+        if (f.task_percent.value != "auto") {
+        
+        if (isNaN(f.task_percent.value) || parseInt(f.task_percent.value) > 100 || parseInt(f.task_percent.value) <= 0) {
+                        f.task_percent.style.backgroundColor="#ffcc00";
+                        error = 2
+        } else {f.task_percent.style.backgroundColor="#ffffff";}
+        }
+        if (isNaN(f.task_max_grade.value) || parseInt(f.task_max_grade.value) <= 0){            
+                        f.task_max_grade.style.backgroundColor="#ffcc00"
+                        error = 3                       
+        } else {f.task_max_grade.style.backgroundColor="#ffffff";}
+
+        if (error > 0) { alert ("#cards.card_Invalid_data#");return false}
+        else return true
+        }
+        
+}       
+        
+//  End -->
+</script>
+
+<link rel="stylesheet" href="cards.css" type="text/css">
+<!-- CABECERA -->
+<DIV class="all">
+<div class="comm">@community_name@</div>
+<div class="back">
+        <A HREF="cards_list" class="back">#cards.card_Back#</A>
+</div>
+<div class="spacer">&nbsp;</div>
+
+<if @block:rowcount@ eq 0>
+<h4 style="color:#6186b0">&nbsp;#cards.card_tasks_list#</h4><BR>
+<A href="manage_blocks">#cards.blocks_first#</a>
+</if><else>
+
+
+<!-- TABLA DE TAREAS / ANOTACIONES -->
+
+<table  class="uv_table" summary="#cards.summary_Task_list#">
+  <caption class="uv_table">#cards.card_tasks_list#</caption>
+  <tr class="uv_table_header">
+        <th class="uv_cell" width="4%" align="center"><B>N�</B></th>
+        <th class="uv_cell" width="23%" align="left" title="#cards.tooltip_block_of_task#">#cards.card_task_block#
+                <A HREF="manage_tasks?order=ref_percent&order_dir=asc" class="orderby" 
+                        title="#cards.tooltip_orderby_asc#">
+                        <IMG SRC="icons/up.gif" alt="#cards.tooltip_orderby_asc#"></A>
+                <A HREF="manage_tasks?order=ref_percent&order_dir=desc" class="noline"
+                        title="#cards.tooltip_orderby_desc#">
+                        <IMG SRC="icons/down.gif" alt="#cards.tooltip_orderby_desc#"></A>
+        </th>
+        
+        <th class="uv_cell" width="45%" align="left">#cards.card_task_name#
+                <A HREF="manage_tasks?order=task_name&order_dir=asc" class="orderby" 
+                        title="#cards.tooltip_orderby_asc#">
+                        <IMG SRC="icons/up.gif" alt="#cards.tooltip_orderby_asc#"></A>
+                <A HREF="manage_tasks?order=task_name&order_dir=desc" class="noline"
+                        title="#cards.tooltip_orderby_desc#">
+                        <IMG SRC="icons/down.gif" alt="#cards.tooltip_orderby_desc#"></A>
+        </th>
+        <th class="uv_cell" width="8%" align="center" abbr="#cards.percent#" title="#cards.percent#">%</th>     
+                <th class="uv_cell" width="10%" align="center" title="#cards.tooltip_max_grade#">#cards.card_task_max_grade#</th>       
+        <if @mode@ eq "edit">
+        <th class="uv_cell" width="5%" align="center"><B>#cards.card_Accept#</B></th>
+        <th class="uv_cell" width="5%" align="center" style="padding:4px"><B>#cards.card_Cancel#</B></th>       
+        </if><else>
+        <th class="uv_cell" width="5%" align="center"><B>#cards.card_Edit#</B></th>
+        <th class="uv_cell" width="5%" align="center" style="padding:4px"><B>#cards.card_Delete#</B></th>       
+        </else>
+  </tr>
+        
+  <!-- LLISTEM LES TASKS  DE LA COMUNITAT -->
+  <multiple name="task">
+  <!-- SI EL BLOC ACTUAL ES EDITAT -->
+  <if @task.task_id@ eq @task_sel_edit@> 
+  <tr class="uv_cell_insert">
+        <td class="uv_cell_insert" width="4%" align="center">@task.rownum@</td>    
+        <FORM METHOD="post" name="fe" onSubmit ="return validaForm(this)">
+        <INPUT type="hidden" name="task_id" value="@task.task_id@">             
+        <!--  ********* type  **********-->             
+        <td width="23%" class="uv_cell_insert">
+          <SELECT name="task_block_type" onchange="if(this.options[this.selectedIndex].value.split('-')[1] !=3) {fe.task_percent.disabled = true;fe.task_percent.value = 'auto'}        else {fe.task_percent.disabled = false; fe.task_percent.value = 0} fe.task_block.value = this.options[this.selectedIndex].value.split('-')[0]">
+                <multiple name="block">
+                  <if @block.percent_id@ eq @task.ref_percent@>
+                        <OPTION selected value="@block.percent_id@-@block.type@">@block.percent_name@                           
+                  </if>
+                  <else><OPTION value="@block.percent_id@-@block.type@">@block.percent_name@</else>
+                </multiple>
+          </SELECT></td>
+        <!--  ********* name  **********-->
+        <td width="45%" class="uv_cell_insert" >
+          <INPUT type="text" size="50" name="task_name" value="@task.task_name@"></td>
+        <!--  ********* %  **********-->
+        <td width="8%" align="center" class="uv_cell_insert">           
+                <if @task.type@ ne 3><INPUT type="text" size="5" name="task_percent" value="auto" disabled></if>
+                <else><INPUT type="text" size="5" name="task_percent" value="@task.task_percent@"></else>
+        </TD>
+        <!--  *********  <=  **********-->                                              
+        <td width="8%" align="center" class="uv_cell_insert">
+          <INPUT type="text" size="5" name="task_max_grade" value="@task.max_grade@">
+        <!--  *********  BOTONES  **********-->                                         
+        <td width="6%" class="uv_cell_insert" align="center">           
+                <INPUT type="hidden" name="mode" value="">
+                <INPUT type="hidden" name="task_block" value="@task.ref_percent@">
+                <INPUT type="hidden" name="order" value="@order@">
+                <INPUT type="hidden" name="order_dir" value="@order_dir@">
+                <INPUT type="image" name="submit" value="submit" size="10" src="icons/ok.gif" 
+                ALT="#cards.tooltip_save_changes#" title="#cards.tooltip_save_changes#" 
+                onclick="document.fe.mode.value='update'">              
+                
+        <td width="6%" class="uv_cell_insert" align="center">
+                <INPUT type="image" name="submit" value="submit" 
+                size="10" title="#cards.tooltip_discard_changes#" ALT="#cards.tooltip_discard_changes#"
+                src="icons/ko.gif" onclick="document.fe.mode.value='cancel'"></td>
+        </FORM>
+        </if><else> <!-- SI LA ASIGNACION ACTUAL NO ES LA EDITADA -->
+          <if @task.rownum@ odd>        
+                <tr class="list-odd" onmouseover="javascript:style.backgroundColor='#99ccff'" onmouseout="javascript:style.backgroundColor='#EAF2FF'">
+          </if><else>
+                <tr class="list-even" onmouseover="javascript:style.backgroundColor='#99ccff'" onmouseout="javascript:style.backgroundColor='#FFFFFF'">
+          </else>                               
+        <td class="uv_cell" width="4%" align="center">@task.rownum@</td>                                
+        <td width="23%" class="uv_cell">@task.percent_name@</td>
+        <td width="45%" class="uv_cell">
+        <a href="grade_task_list?task_id=@task.task_id@&mode=list"
+                class="noline" title="#cards.tooltip_list_to_print#">
+        <IMG src="icons/listado.gif" alt="#cards.tooltip_list_to_print#"></a>&nbsp;
+        <a href="grade_task_list?task_id=@task.task_id@&mode=csv" 
+                class="noline" title="#cards.tooltip_csv#">
+        <IMG src="icons/csv.gif" alt="#cards.tooltip_csv#"></a>&nbsp;&nbsp;&nbsp;
+        <A HREF="grade_task?task_id=@task.task_id@" class="noline"
+                title="#cards.tooltip_grade_students#">@task.task_name@</a></td>
+        <td width="8%" align="center" class="uv_cell" >
+                <if @task.type@ ne 3>auto</if>
+                <else>@task.task_percent@</else></td>
+        <td width="8%" align="center" class="uv_cell" >@task.max_grade@</td>
+        <!-- MODE EDIT LINK **************************************************-->       
+        <FORM METHOD="post" name="fm" class="p">
+        <td width="6%"  height="auto" class="uv_cell" align="center">
+                <if @is_edit@ ne 1>
+                <INPUT type="hidden" name="task_id" value="@task.task_id@">
+                <INPUT type="hidden" name="mode" value="edit">
+                <INPUT type="hidden" name="order" value="@order@">
+                <INPUT type="hidden" name="order_dir" value="@order_dir@">
+                <INPUT type="image" name="submit" value="submit" border="0" alt="#cards.card_Edit#" 
+                title="#cards.card_Edit# #cards.card_task#" src="icons/edit.gif" 
+                style="margin:0;padding:0">             
+                </if></td></form>
+        <!-- MODE DELETE LINK ****************************************************-->
+        <FORM METHOD="post" name="fd" style="height:5px;vertical-align:middle">
+        <td width="6%" class="uv_cell" align="center">
+                <if @is_edit@ ne 1>
+                <INPUT type="hidden" name="task_id" value="@task.task_id@">
+                <INPUT type="hidden" name="mode" value="delete">
+                <INPUT type="hidden" name="order" value="@order@">
+                <INPUT type="hidden" name="order_dir" value="@order_dir@">
+                <INPUT type="image" name="submit" value="submit" border="0" 
+                title="#cards.card_Delete# #cards.card_task#" alt="#cards.card_Delete# #cards.card_task#" 
+                src="icons/papelera.gif" style="margin:0;padding:0" onclick="return confirm('#cards.card_del_note1# @task.task_name@ #cards.card_del_note2#')">
+                </if></td></form>               
+        </else>
+        </tr>
+        </multiple>     
+
+<!-- Aqui va una fila para INSERTAR tipos a no ser que estemos en edici�n-->
+<if @mode@ ne "edit">
+        <FORM METHOD="post" name="fi"  onSubmit ="return validaForm(this)">
+        <!-- <INPUT type="hidden" name="asig_id" value="update">  No estoy seguro de que haga falta -->
+        <tr class="uv_cell_insert">
+                <td width="4%" align="center" class="uv_cell_insert"><span class="big">*</span></td>
+                <td width="23%" class="uv_cell_insert">                 
+                <SELECT name="task_block_type" onchange="if(this.options[this.selectedIndex].value.split('-')[1] !=3) {fi.task_percent.disabled = true;fi.task_percent.value = 'auto'}  else {fi.task_percent.disabled = false; fi.task_percent.value = 0} fi.task_block.value = this.options[this.selectedIndex].value.split('-')[0]">
+                                <multiple name="block">
+                                        <OPTION value="@block.percent_id@-@block.type@">@block.percent_name@</OPTION>   
+                                </multiple>     
+                        </SELECT>
+                </td>
+                <td width="45%" class="uv_cell_insert">
+                        <INPUT type="text" size="55" name="task_name" value="@task_name_sel@"></td>
+                <td width="8%" align="center" class="uv_cell_insert">
+                        <if @task_type_sel@ ne 3>
+                        <INPUT type="text" size="5" name="task_percent" value="auto" disabled>
+                        </if><else>
+                        <INPUT type="text" size="5" name="task_percent" value="0"></else>
+                        </td>
+                <td width="8%" align="center" class="uv_cell_insert">
+                        <INPUT type="text" size="5" name="task_max_grade" value="@task_max_grade@"></td>                        
+                <td width="6%" colspan="2" class="uv_cell_insert"><CENTER>
+                        <INPUT type="hidden" name="mode" value="insert">
+                        <INPUT type="hidden" name="task_block" value="@task_percent_sel@">                      
+                        <INPUT type="hidden" name="order" value="@order@">
+                        <INPUT type="hidden" name="order_dir" value="@order_dir@">
+                        <INPUT type="image" name="submit" value="submit" border="0" 
+                                title="#dotlrn.New# #cards.card_task#"  ALT="#dotlrn.New# #cards.card_task#" 
+                                src="icons/plus.gif" style="margin:0;padding:0"></CENTER></td>
+        </tr></form>
+</if>
+
+</TABLE>
+
+</ELSE>
+<BR><BR>
+<if @error@>
+<SCRIPT>
+eval ("@cambia@")
+eval("@senyala@" + "'#ffcc00'")
+alert("@msg_error@")
+
+
+</SCRIPT>
+</if>
Index: openacs-4/packages/cards/www/manage_tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/manage_tasks.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/manage_tasks.tcl	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,164 @@
+ad_page_contract {
+}  -query {  
+  {mode:optional ""}
+  {task_id:integer,optional ""}  
+  {task_block:integer,optional ""}  
+  {task_name:optional ""}  
+  {task_percent:float,optional 0} 
+  {task_max_grade:float,optional 10.00}
+  {nav_sel:optional ""}    
+  {order:optional task_name}
+  {order_dir:optional asc}  
+} -properties {
+}
+
+# Declaraci� de variables a emprar
+set error 0
+set msg_error ""
+set link_url ""
+set task_sel_edit ""
+set is_edit 0
+
+# Comunitat a la que estem. Check if we are in a subcommunity. In this case, we use the big parent community.
+# but we only show the user cards that are in subgroup
+# Community and big parent community
+set community_selected [dotlrn_community::get_community_id]
+set community_name [cards::get_community_pretty_name -community_id $community_selected]
+set parent_community_id [cards::get_big_parent_community -community_id $community_selected]
+set reuse_parent_cards [cards::get_community_parameter -community_id $community_selected -param "ReuseParentCards"]
+if {$community_selected == $parent_community_id} {
+        set subgroup 0
+        set community_id $community_selected
+} else {
+        set subgroup 1
+        set community_id $community_selected
+        # If we reuse the cards we have to do the next actions, otherwise notihing to do
+        if {$reuse_parent_cards eq 1} {
+                set community_id $parent_community_id
+                set community_name [cards::get_community_pretty_name -community_id $community_id]
+                append  community_name " :: " [cards::get_community_pretty_name -community_id $community_selected]              
+        }
+}
+
+# Usuari que som y url a la que estem
+set my_user_id [ad_conn user_id]
+set referer [ns_conn url]
+
+# Si no som administradors  [admin_p = 0] --> error: permis denegat 
+set admin_p [dotlrn::user_can_admin_community_p -user_id $my_user_id -community_id $community_id]
+if {!$admin_p} {
+                        ad_return_error [lang::util::localize "#acs-subsite.Error#"] [lang::util::localize "#dotlrn.deniedpermission#"]         
+}
+
+
+##########     MODE  CANCELAR --> No fa res, redireccio a la pagina anterior     ##########
+if {$mode eq "cancel"} {
+        set mode ""
+    #ad_returnredirect "./manage_tasks?order=$order&order_dir=$order_dir"
+}
+
+##########     MODO  INSERTAR                                                  ##########
+if {$mode eq "insert"} {
+        # Comprobaci�n nombre bloque ya existe
+        set found_task [db_0or1row found_task_i { *SQL* }]
+        if {($found_task eq 0) && ($task_name ne "") && ($task_name ne " ")} {
+                if {($task_percent >= 0) && ($task_percent <= 100)} {
+                        if {($task_max_grade >= 0)} {
+                                # Obtener task_type
+                                set task_type [cards::get_task_type -task_block $task_block]    
+                                if {$task_type eq 3} {
+                                        # Comprobar porcentajes totales
+                                        set xcent 0
+                                } else {
+                                        set task_percent -1
+                                }
+                                db_dml insert_task { *SQL* } 
+                                set l_task [cards::get_community_tasks -community_id $community_id]
+                                set id_task [lindex $l_task [expr [llength $l_task] - 1]]
+                                set l_cards [cards::get_all_community_cards -community_id $community_id]
+                                foreach cid $l_cards {
+                                        cards::create_student_note -community_id $community_id -card_id $cid -task_id $id_task
+                                }                               
+                                set mode ""
+                                set task_max_grade 10
+                                #ad_returnredirect "./manage_tasks?order=$order&order_dir=$order_dir"
+                        } else {
+                                set error 1
+                set msg_error "Nota m�xima no v�lida."
+                                append cambia "document.fi.task_max_grade.value='" $task_max_grade "'"
+                                set senyala "document.fi.task_max_grade.style.backgroundColor="
+                        }
+                } else {
+                        set error 1
+                        set msg_error "Porcentaje no v�lido"
+                        append cambia "document.fi.task_percent.value='" $task_percent "'"
+                        set senyala "document.fi.task_percent.style.backgroundColor="
+                }        
+        } else {
+                set error 1
+        set msg_error "Nombre de bloque ya existe o es nulo"
+                append cambia "document.fi.task_name.value='" $task_name "'"
+                set senyala "document.fi.task_name.style.backgroundColor="
+        }
+
+} 
+
+##########     MODO  ACTUALIZAR            ##########
+if {$mode eq "update"} {
+        # Comprobaci�n nombre bloque ya existe
+        set found_task [db_0or1row found_task_u { *SQL* }]
+        if {($found_task eq 0) && ($task_name ne "") && ($task_name ne " ")} {
+                if {($task_percent >= 0) && ($task_percent <= 100)} {
+                        if {($task_max_grade >= 0)} {
+                                db_dml update_task { *SQL* } 
+                                set mode ""
+                                set task_max_grade 10
+                                #ad_returnredirect "./manage_tasks?order=$order&order_dir=$order_dir"
+                        } else {
+                                set error 1
+                set msg_error "Nota m�xima no v�lida."
+                                append cambia "document.fe.task_max_grade.value='" $task_max_grade "'"
+                                set senyala "document.fe.task_max_grade.style.backgroundColor="
+                        }
+                } else {
+                        set error 1
+                        set msg_error "Porcentaje no v�lido"
+                        append cambia "document.fe.task_percent.value='" $task_percent "'"
+                        set senyala "document.fe.task_percent.style.backgroundColor="
+                }        
+        } else {
+                set error 1
+        set msg_error "Nombre de bloque ya existe o es nulo"
+                append cambia "document.fe.task_name.value='" $task_name "'"
+                set senyala "document.fe.task_name.style.backgroundColor="
+        }
+} 
+
+##########     MODO  BORRAR --> Borrado en cascada            ########## 
+if {$mode eq "delete"} {
+        # Borramos las anotaciones de los alumnos para esa tarea
+        db_dml delete_notes { *SQL* }               
+        # Borramos la tarea
+        db_dml delete_task  { *SQL* }
+        set mode ""
+}               
+
+##########     MODO  EDITAR --> Modificar bloques ya creados    ##########
+if {$mode eq "edit"} {
+        set task_sel_edit $task_id
+        set is_edit 1
+} else {
+        db_multirow block2 select_blocks { *SQL* } 
+        multirow foreach block2 {
+                set task_name_sel ""
+                set task_percent_sel $percent_id
+                set task_type_sel $type
+                break
+        }
+}
+
+
+# Obtenim la llista de blocs de la comunitat
+db_multirow task select_tasks { *SQL* } 
+db_multirow block select_blocks { *SQL* }
+
Index: openacs-4/packages/cards/www/manage_tasks.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/manage_tasks.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/manage_tasks.xql	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,95 @@
+<?xml version="1.0"?>
+
+<queryset>
+    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+
+        <fullquery name="found_task_i">
+        <querytext>
+                        select  task_id from card_task 
+                        where   ref_community = :community_id and 
+                                        task_name = :task_name and
+                                        ref_percent = :task_block
+                </querytext>
+    </fullquery>        
+        
+
+        <fullquery name="found_task_u">
+        <querytext>
+                        select  task_id from card_task 
+                        where   ref_community = :community_id and 
+                                        task_name = :task_name and
+                                        ref_percent = :task_block
+                                        and task_id <> :task_id
+                </querytext>
+    </fullquery>
+
+
+        <fullquery name="select_tasks">
+        <querytext>
+                        select t.*,p.percent_id, p.type, p.percent_name
+                        from card_task t 
+                        inner join card_percent p on (percent_id = ref_percent) 
+                        where t.ref_community = :community_id
+                        order by $order $order_dir
+                </querytext>
+    </fullquery>
+        
+        <fullquery name="select_blocks">
+        <querytext>
+                        select *                        
+                        from card_percent p 
+                        where p.ref_community = :community_id
+                        order by type asc
+                </querytext>
+    </fullquery>
+
+        <fullquery name="select_tasks_by_percent">
+        <querytext>
+                        select  * from card_task 
+                        where   ref_community = :community_id and
+                                        ref_percent = :nav_sel
+                                        order by $order $order_dir
+                </querytext>
+        </fullquery>
+
+        
+        <fullquery name="insert_task">
+        <querytext>
+                insert into card_task
+                        (ref_community, ref_percent, task_name, task_percent, max_grade)
+                values
+                        (:community_id, :task_block, :task_name, :task_percent, :task_max_grade)
+                </querytext>
+    </fullquery>
+                
+        <fullquery name="update_task">
+        <querytext>
+                        update card_task set 
+                                ref_percent = :task_block, task_name = :task_name, 
+                                task_percent= :task_percent, max_grade= :task_max_grade
+                        where ref_community = :community_id and
+                                task_id = :task_id
+                </querytext>
+    </fullquery>
+        
+        <fullquery name="delete_task">
+        <querytext>
+                        delete from card_task where task_id = :task_id 
+            </querytext>
+    </fullquery>        
+
+        <fullquery name="delete_notes">
+        <querytext>
+                        delete from card_note where ref_task= :task_id
+            </querytext>
+    </fullquery>        
+        
+        <fullquery name="get_percent_type">
+        <querytext>
+                        select type as sel_type from card_percent where percent_id = :act_ref_percent
+            </querytext>
+    </fullquery>                
+        
+</queryset>
+        
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/cards/www/notes.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/cards/www/notes.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/cards/www/notes.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/cards/www/orla.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/cards/www/orla.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/cards/www/orla.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/cards/www/personal_info.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/personal_info.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/personal_info.adp	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,92 @@
+<SCRIPT LANGUAGE="JavaScript">
+<!--
+function check_text(campo, num, max) {
+if (campo.value.length > max) campo.value = campo.value.substring(0, max);
+else num.value = max - campo.value.length;
+}
+-->
+</script>
+<STYLE type="text/css">
+.borde1 {border: 1px solid #5C81B7} 
+.borde1a { background:#CCDDFF; width:25%} 
+.borde2 {border-bottom: 1px solid #5C81B7}
+.borde_top {border-top: 1px solid #5C81B7}
+.borde_no_top {border-right: 1px solid #5C81B7; border-bottom: 1px solid #5C81B7; border-left:1px solid #5C81B7}
+</style>
+
+<TABLE class="form">
+<CAPTION class="form">&nbsp;#cards.card_Personal_info#</CAPTION>
+<TR class="form">
+        <TH class="form">#dotlrn.student_role_pretty_name#: </TH>
+        <TD class="form">@last_name@, @first_names@</TD>
+        <TD ROWSPAN="5" class="photo">@photo_student;noquote@</TD>
+</TR>
+<TR class="form">
+        <TH class="form">#cards.Email#: </TH>
+        <TD class="form">@user_info.email@</TD>
+</TR><TR class="form">
+        <TH class="form">#cards.Home_page#: </TH>
+        <TD class="form">@user_info.url@&nbsp;</TD>
+</TR><TR class="form">
+        <TH class="form">#cards.address#: </TH>
+        <TD class="form">@address@&nbsp;</TD>
+</TR><TR class="form">
+        <TH class="form">#cards.phones#: </TH>
+        <TD class="form">@phone1@&nbsp;</TD>
+</TR>
+        
+</TABLE>
+
+<BR>
+
+<!-- TEACHER COMMENT --> 
+<TABLE class="form">
+<CAPTION class="form">&nbsp;#cards.comunication#</CAPTION>
+<TR class="form">
+        <TH class="form">#cards.student_comment#: </TH>
+        <TD class="form"><PRE>@comm_student@&nbsp;</PRE></TD>
+</TR>
+<TR class="form">
+        <TH class="form">#cards.teacher_comment#: <BR> 
+        <A HREF="student_notes?user_id=@user_id@&nav_sel=ficha&mode=teacher_edit" title="#cards.teacher_comment# #cards.card_Edit#" class="noline"><img alt="#cards.teacher_comment# #cards.card_Edit#" src="icons/edit.gif"></A>
+        </TH>
+        <if @mode@ ne "teacher_edit">
+                <!-- MODE EDIT LINK **************************************************-->       
+        <TD class="form"><PRE>@comm_teacher@</PRE>
+        
+
+        </TD>
+                
+        </if><else>
+                <FORM METHOD="post" name="fe_teacher" onSubmit="">      
+        <TD class="form">
+                <TEXTAREA rows="3" cols="80" name="teacher_comment" style="font:100% Arial; text-align:left"
+                onKeyDown="check_text(this.form.teacher_comment,this.form.resto,1000);" 
+                onKeyUp="check_text(this.form.teacher_comment,this.form.resto,1000)">@comm_teacher@</TEXTAREA>
+                <BR>
+                <SPAN style="font-size:80%">#cards.max_char1# 1000 #cards.max_char2# 
+        <input readonly type="text" name="resto" size="4" maxlength="4" value="1000"
+        style="font-size:90%; text-align: center"></span>
+        
+                
+        
+                <INPUT type="hidden" name="user_id" value="@user_id@">
+                <INPUT type="hidden" name="nav_sel" value="ficha">
+                <INPUT type="hidden" name="mode" value="">
+                <INPUT type="image" name="submit" value="submit" size="10" src="icons/ok.gif" 
+                ALT="#cards.card_Accept#" title="#cards.card_Accept#" 
+                onclick="document.fe_teacher.mode.value='teacher_update'">&nbsp;&nbsp;
+                <INPUT type="image" name="submit" value="submit" size="10" title="#cards.card_Cancel#" 
+                src="icons/ko.gif" ALT="#cards.card_Cancel#" 
+                onclick="document.fe_teacher.mode.value='';document.fe_teacher.teacher_comment.value='' ">
+                </TD>
+                </form>         
+        
+        
+        </else>         
+
+        </tr>
+
+</TABLE>
+
+<BR>
Index: openacs-4/packages/cards/www/personal_info.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/personal_info.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/personal_info.tcl	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,53 @@
+ad_page_contract {
+}  -query {     
+  user_id:integer,notnull
+  {mode:optional ""}  
+  {mail_subject:optional ""}
+  {mail_body:optional ""}
+} -properties {
+}
+
+# Declaraci� de variables
+set widthheight_param "width=72 height=90"
+set export_vars [export_url_vars user_id]
+acs_user::get -user_id $user_id -array user_info
+set existe_photo 1
+set subsite_url [subsite::get_element -element url]
+
+# Comunitat a la que estem. Check if we are in a subcommunity. In this case, we use the big parent community.
+# but we only show the user cards that are in subgroup
+# Community and big parent community
+set community_selected [dotlrn_community::get_community_id]
+set community_name [cards::get_community_pretty_name -community_id $community_selected]
+set parent_community_id [cards::get_big_parent_community -community_id $community_selected]
+set reuse_parent_cards [cards::get_community_parameter -community_id $community_selected -param "ReuseParentCards"]
+if {$community_selected == $parent_community_id} {
+        set subgroup 0
+        set community_id $community_selected
+} else {
+        set subgroup 1
+        set community_id $community_selected
+        # If we reuse the cards we have to do the next actions, otherwise notihing to do
+        if {$reuse_parent_cards eq 1} {
+                set community_id $parent_community_id
+                set community_name [cards::get_community_pretty_name -community_id $community_id]
+                append  community_name " :: " [cards::get_community_pretty_name -community_id $community_selected]              
+        }
+}
+
+# Usuari que som y url a la que estem
+set card_id [cards::get_card_id -community_id $community_id -user_id $user_id]
+set my_user_id [ad_conn user_id]
+set referer [ns_conn url]
+set photo_student [cards::get_student_photo -user_id $user_id -param $widthheight_param -return_url $referer -admin "1"]
+
+
+# Si no som administradors  [admin_p = 0] --> error: permis denegat 
+set admin_p [dotlrn::user_can_admin_community_p -user_id $my_user_id -community_id $community_id]
+if {!$admin_p} {
+                        ad_return_error [lang::util::localize "#acs-subsite.Error#"] [lang::util::localize "#dotlrn.deniedpermission#"]         
+}
+
+
+db_0or1row select_found_card { *SQL* }
+db_1row student_name { *SQL* }
Index: openacs-4/packages/cards/www/personal_info.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/personal_info.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/personal_info.xql	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<queryset>
+    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+        
+        <fullquery name="student_name">
+        <querytext>
+                        select last_name, first_names 
+                        from acs_users_all 
+                        where user_id = :user_id
+            </querytext>
+    </fullquery>
+
+        <fullquery name="select_found_card">
+                <querytext>
+                        select * from card 
+                        where ref_user= :user_id and ref_community= :community_id
+                </querytext>
+        </fullquery>    
+
+</queryset>
Index: openacs-4/packages/cards/www/student_card.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/student_card.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/student_card.adp	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,62 @@
+<master>
+<property name="title">@community_name@</property>
+<link rel="stylesheet" href="cards.css" type="text/css">
+
+<!-- CABECERA -->
+
+<DIV  class="all">
+        <div class="float"><span class="cursive">#cards.card_Student#</span>: <span class="bold">@user_name@&nbsp;&nbsp;</span></div>
+        <div class="float"><span class="cursive">#cards.card_Subjet#</span>: <span class="bold">@community_name@&nbsp;&nbsp;</span></div>
+        <div class="back">
+                <A HREF="../one-community" class="back">#cards.card_Back#</A>
+        </div>
+<div class="spacer">&nbsp;</div>
+
+
+<if @allow_view_grades@ eq 1>
+<!-- BARRA DE NAVEGACION-->
+<div class="navbar">
+<!-- Datos personales ***********************************************************************-->
+        <a href="student_card?user_id=@user_id@&nav_sel=ficha" class="button_item">#cards.card_Personal_info#</a>
+
+
+<!-- Notas Completas ***********************************************************************-->         
+        <a href="student_card?user_id=@user_id@" class="button_item">#cards.card_Grades#</a>
+
+<!-- Bloques de notas ***********************************************************************-->                  
+        <multiple name="blocks">
+        <a href="student_card?user_id=@user_id@&nav_sel=@blocks.percent_id@" class="button_item">@blocks.percent_name@</a>
+  </multiple>
+</if>
+<div class="spacer">&nbsp;</div>
+  
+<div>
+  
+
+<!-- DATOS PERSONALES *******************************************************************-->
+<if @nav_sel@ eq "ficha">
+        <include src="student_info" &=user_id=@user_id@ &=mode=@mode@>
+</if>
+
+
+
+<!-- NOTAS *******************************************************************-->
+<if @allow_view_grades@ eq 1>
+        <if @nav_sel@ ne "ficha" and @nav_sel@ ne "comment" and @nav_sel@ ne 0>
+                <include src="grades_student" &=user_id=@user_id@ &=nav_sel=@nav_sel@>
+        </if>
+</if>
+
+
+
+</div>
+<BR>
+
+
+<if @error@>
+<SCRIPT>
+eval ("@cambia@")
+eval("@senyala@" + "'#ffcc00'")
+alert("@msg_error@")
+</SCRIPT>
+</if>
Index: openacs-4/packages/cards/www/student_card.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/student_card.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/student_card.tcl	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,89 @@
+ad_page_contract {
+}  -query {     
+  user_id:integer,notnull
+  {mode:optional ""}  
+  {nav_sel:optional ""}  
+  {mail_subject:optional ""}
+  {mail_body:optional ""}
+  {info_edit:optional ""}
+  {user_address:optional ""}
+  {user_phones:optional ""}  
+  {comment_id:optional ""}
+  {comment:optional ""}  
+  {student_comment:optional ""}  
+  
+} -properties {
+}
+
+# Declaraci� de variables a emprar
+set error 0
+set senyala ""
+set link_url ""
+set task_sel_edit ""
+set is_edit 0
+set info_edit 0
+set grade_avg 10
+set user_id $user_id
+set msg ""
+
+# Comunitat a la que estem. Check if we are in a subcommunity. In this case, we use the big parent community.
+# but we only show the user cards that are in subgroup
+# Community and big parent community
+set community_selected [dotlrn_community::get_community_id]
+set community_name [cards::get_community_pretty_name -community_id $community_selected]
+set parent_community_id [cards::get_big_parent_community -community_id $community_selected]
+set reuse_parent_cards [cards::get_community_parameter -community_id $community_selected -param "ReuseParentCards"]
+if {$community_selected == $parent_community_id} {
+        set subgroup 0
+        set community_id $community_selected
+} else {
+        set subgroup 1
+        set community_id $community_selected
+        # If we reuse the cards we have to do the next actions, otherwise notihing to do
+        if {$reuse_parent_cards eq 1} {
+                set community_id $parent_community_id
+                set community_name [cards::get_community_pretty_name -community_id $community_id]
+                append  community_name " :: " [cards::get_community_pretty_name -community_id $community_selected]              
+        }
+}
+set allow_view_grades [cards::get_community_parameter -community_id $community_selected -param "AllowGradeView"] 
+
+
+# Usuari que som y url a la que estem
+set card_id [cards::get_card_id -community_id $community_id -user_id $user_id]
+set my_user_id [ad_conn user_id]
+set referer [ns_conn url]
+
+# Envio de MAILS
+if {$mode eq "mail"} {  
+        db_1row get_teacher_mail { *SQL* }
+        db_1row get_student_mail { *SQL* }
+
+        ns_sendmail $student_email $teacher_email $mail_subject $mail_body
+        set mode ""
+        set datetime [clock_to_ansi [clock seconds]]
+        append comment "-> " $datetime ": " $mail_subject "<BR> " $mail_body    
+        db_dml update_last_sendmail { *SQL* } 
+}
+
+
+# Update student_info
+if {$mode eq "info_update"} {   
+        set date [clock_to_ansi [clock seconds]]
+        db_dml update_student_info { *SQL* } 
+        set mode ""
+        #ad_returnredirect "./student_card?user_id=$user_id&nav_sel=$nav_sel"
+}
+
+#Update student_comment
+if {$mode eq "student_update"} {        
+db_dml update_student_comment { *SQL* } 
+        set mode ""
+        set note_id ""
+        #ad_returnredirect "./student_card?user_id=$user_id&nav_sel=$nav_sel"
+}
+
+set user_name [cards::get_student_name -user_id $user_id]
+
+db_multirow blocks select_blocks { *SQL* }
+
Index: openacs-4/packages/cards/www/student_card.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/student_card.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/student_card.xql	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,61 @@
+
+<?xml version="1.0"?>
+
+<queryset>
+    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+        
+        <fullquery name="select_blocks">
+                <querytext>
+                        select * from card_percent
+                        where ref_community = :community_id
+                        order by percent desc
+            </querytext>
+    </fullquery>        
+
+<fullquery name="get_teacher_mail">
+    <querytext>
+                select email as teacher_email from acs_users_all where user_id = :my_user_id
+        </querytext>
+</fullquery>    
+
+
+
+<fullquery name="get_student_mail">
+    <querytext>
+                select email as student_email from acs_users_all where user_id = :user_id
+        </querytext>
+</fullquery>    
+
+
+<fullquery name="update_last_sendmail">
+    <querytext>
+                update card set 
+                comm_teacher = :comment
+                where ref_community = :community_id and
+                card_id = :card_id
+        </querytext>
+</fullquery>    
+
+
+<fullquery name="update_student_info">
+    <querytext>
+                update card set 
+                address = :user_address,
+                phone1 = :user_phones
+                where ref_community = :community_id and
+                card_id = :card_id
+        </querytext>
+</fullquery>    
+
+<fullquery name="update_student_comment">
+    <querytext>
+                update card set 
+                comm_student = :student_comment
+                where ref_community = :community_id and
+                card_id = :card_id
+        </querytext>
+        </fullquery>            
+        
+        
+</queryset>
+
Index: openacs-4/packages/cards/www/student_info.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/student_info.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/student_info.adp	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,132 @@
+<SCRIPT LANGUAGE="JavaScript">
+<!--
+function check_text(campo, num, max) {
+if (campo.value.length > max) campo.value = campo.value.substring(0, max);
+else num.value = max - campo.value.length;
+}
+-->
+</script>
+<STYLE type="text/css">
+.borde1 {border: 1px solid #5C81B7} 
+.borde1a { background:#CCDDFF; width:25%} 
+.borde2 {border-bottom: 1px solid #5C81B7}
+.borde_top {border-top: 1px solid #5C81B7}
+.borde_no_top {border-right: 1px solid #5C81B7; border-bottom: 1px solid #5C81B7; border-left:1px solid #5C81B7}
+</style>
+
+<TABLE class="form">
+<CAPTION class="form">&nbsp;#cards.card_Personal_info#</CAPTION>
+<TR class="form">
+        <TH class="form">#dotlrn.student_role_pretty_name#: </TH>
+        <TD class="form">@last_name@, @first_names@</TD>
+        <TD ROWSPAN="5" class="photo">@photo_student;noquote@</TD>
+</TR>
+<TR class="form">
+        <TH class="form">#cards.Email#: </TH>
+        <TD class="form">@user_info.email@</TD>
+</TR><TR class="form">
+        <TH class="form">#cards.Home_page#: </TH>
+        <TD class="form">@user_info.url@&nbsp;</TD>
+
+
+
+<if @mode@ ne "info_edit">
+</TR><TR class="form">
+        <TH class="form">#cards.address#: </TH>
+        <TD class="form">@address@&nbsp;</TD>
+</TR><TR class="form">
+        <TH class="form">#cards.phones#: </TH>
+        <TD class="form">@phone1@&nbsp;</TD>
+</TR>
+<!-- MODE EDIT LINK **************************************************-->       
+<TR class="form">
+<FORM METHOD="post" name="fm_info">
+        <TD class=""><INPUT type="hidden" name="user_id" value="@user_id@">
+                <INPUT type="hidden" name="nav_sel" value="ficha">
+                <INPUT type="hidden" name="mode" value="info_edit">
+                <INPUT type="image" name="submit" value="submit" border="0" alt="#Edit Info" 
+                title="#Edit Info" src="icons/edit.gif" style="margin:0;padding:0"></TD>
+                </form>
+        </TR>
+</if><else>
+<FORM METHOD="post" name="fe_info" onSubmit="">
+<TR class="form"><TD class="form">#cards.address#: </TD>
+        <TD class="form">
+        <INPUT type="text" size="50" maxlength="50"  name="user_address" value="@address@"></TD>
+        </TR>   
+<TR class="form"><TD class="form">#cards.phones#: </TD>
+        <TD class="form"><INPUT type="text" size="30" maxlength="30"  name="user_phones" value="@phone1@"></TD>
+        </TR>
+<!-- MODE UPDATE LINK **************************************************-->     
+<TR><TD></TD>   
+        <TD><INPUT type="hidden" name="user_id" value="@user_id@">
+                <INPUT type="hidden" name="nav_sel" value="ficha">
+                <INPUT type="hidden" name="mode" value="info_update">
+                <INPUT type="image" name="submit" value="submit" size="10" src="icons/ok.gif" 
+                ALT="#cards.card_Accept#" title="#cards.card_Accept#" 
+                onclick="document.fe_info.mode.value='info_update'">&nbsp;&nbsp;
+                <INPUT type="image" name="submit" value="submit" size="10" title="#cards.card_Cancel#" 
+                src="icons/ko.gif" ALT="#cards.card_Cancel#" 
+                onclick="document.fe_info.mode.value='info_cancel'">
+        </TD>
+        </TR>
+</FORM>
+</else>
+
+</TABLE>
+
+<!-- STUDENT COMMENT --> 
+<TABLE class="form">
+<CAPTION class="form">&nbsp;#cards.comunication#</CAPTION>
+<TR class="form">
+        <TH class="form">#cards.student_comment#:<BR>
+        <A HREF="student_card?user_id=@user_id@&nav_sel=ficha&mode=student_edit" title="#cards.student_comment# #cards.card_Edit#" class="noline"><img alt="#cards.student_comment# #cards.card_Edit#" src="icons/edit.gif"></A>
+        </TH>
+        <if @mode@ ne "student_edit">
+                <!-- MODE EDIT LINK **************************************************-->       
+        <TD class="form"><PRE>@comm_student@&nbsp;</PRE>
+        
+
+        </TD>
+                
+        </if><else>
+                <FORM METHOD="post" name="fe_student" onSubmit="">      
+        <TD class="form">
+                <TEXTAREA rows="3" cols="80" name="student_comment" style="font:100% Arial; text-align:left"
+                onKeyDown="check_text(this.form.student_comment,this.form.resto,1000);" 
+                onKeyUp="check_text(this.form.student_comment,this.form.resto,1000)">@comm_student@</TEXTAREA>
+                <BR>
+                <SPAN style="font-size:80%">#cards.max_char1# 1000 #cards.max_char2# 
+        <input readonly type="text" name="resto" size="4" maxlength="4" value="1000"
+        style="font-size:90%; text-align: center"></span>
+        
+                
+        
+                <INPUT type="hidden" name="user_id" value="@user_id@">
+                <INPUT type="hidden" name="nav_sel" value="ficha">
+                <INPUT type="hidden" name="mode" value="">
+                <INPUT type="image" name="submit" value="submit" size="10" src="icons/ok.gif" 
+                ALT="#cards.card_Accept#" title="#cards.card_Accept#" 
+                onclick="document.fe_student.mode.value='student_update'">&nbsp;&nbsp;
+                <INPUT type="image" name="submit" value="submit" size="10" title="#cards.card_Cancel#" 
+                src="icons/ko.gif" ALT="#cards.card_Cancel#" 
+                onclick="document.fe_student.mode.value='';document.fe_student.student_comment.value='' ">
+                </TD>
+                </form>         
+
+        </else>         
+
+        </tr>
+        <TR class="form">
+                <TH class="form">#cards.teacher_comment#: </TH>
+                <TD class="form"><PRE>@comm_teacher@&nbsp;</PRE></TD>
+        </TR>
+</TABLE>
+        
+        
+        
+        
+        
+        
+        
+<BR>
Index: openacs-4/packages/cards/www/student_info.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/student_info.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/student_info.tcl	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,30 @@
+ad_page_contract {
+}  -query {     
+  user_id:integer,notnull
+  {mode:optional ""}  
+  {mail_subject:optional ""}
+  {mail_body:optional ""}
+} -properties {
+}
+
+# Declaraci� de variables
+set widthheight_param "width=72 height=90"
+set export_vars [export_url_vars user_id]
+acs_user::get -user_id $user_id -array user_info
+set existe_photo 1
+set subsite_url [subsite::get_element -element url]
+
+# Comunitat a la que estem. Check if we are in a subcommunity. In this case, we use the big parent community.
+# but we only show the user cards that are in subgroup
+set community_id [dotlrn_community::get_community_id]
+set community_selected $community_id
+set community_id [cards::get_big_parent_community -community_id $community_id]
+
+# Usuari que som y url a la que estem
+set card_id [cards::get_card_id -community_id $community_id -user_id $user_id]
+set my_user_id [ad_conn user_id]
+set referer [ns_conn url]
+set photo_student [cards::get_student_photo -user_id $user_id -param $widthheight_param -return_url $referer]
+
+db_0or1row select_found_card { *SQL* }
+db_1row student_name { *SQL* }
Index: openacs-4/packages/cards/www/student_info.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/student_info.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/student_info.xql	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<queryset>
+    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+<fullquery name="student_name">
+        <querytext>
+                        select last_name, first_names 
+                        from acs_users_all 
+                        where user_id = :user_id
+            </querytext>
+    </fullquery>
+
+<fullquery name="select_found_card">
+    <querytext>
+                select * from card 
+                where ref_user= :user_id and ref_community= :community_id
+        </querytext>
+</fullquery>    
+
+
+</queryset>
+
Index: openacs-4/packages/cards/www/student_notes.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/student_notes.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/student_notes.adp	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,61 @@
+<master>
+<property name="title">@community_name@</property>
+
+
+<link rel="stylesheet" href="cards.css" type="text/css">
+
+<!-- CABECERA <div class="comm">@community_name@</div>-->
+<DIV  class="all">
+        <div class="float"><span class="cursive">#cards.card_Student#</span>: <span class="bold">@user_name@&nbsp;&nbsp;</span></div>
+        <div class="float"><span class="cursive">#cards.card_Subjet#</span>: <span class="bold">@community_name@&nbsp;&nbsp;</span></div>
+        <div class="back">
+                <A HREF="cards_list" class="back">#cards.card_Back#</A>
+        </div>
+<div class="spacer">&nbsp;</div>
+
+
+<!-- BARRA DE NAVEGACION-->
+<div class="navbar">
+<!-- Datos personales ***********************************************************************-->
+        <a href="student_notes?user_id=@user_id@&nav_sel=ficha" class="button_item">#cards.card_Personal_info#</a>
+
+<!-- Comentaris / Tutories ***********************************************************************-->                   
+        <a href="student_notes?user_id=@user_id@&nav_sel=comment" class="button_item">#cards.comments#</a>
+                
+<!-- Notas Completas ***********************************************************************-->         
+        <a href="student_notes?user_id=@user_id@" class="button_item">#cards.card_Grades#</a>
+
+<!-- Bloques de notas ***********************************************************************-->                  
+        <multiple name="blocks">
+        <a href="student_notes?user_id=@user_id@&nav_sel=@blocks.percent_id@" class="button_item">@blocks.percent_name@</a>
+  </multiple>
+<div class="spacer">&nbsp;</div>
+  
+<div>
+
+<!-- DATOS PERSONALES *******************************************************************-->
+<if @nav_sel@ eq "ficha">
+<include src="personal_info" &=user_id=@user_id@ &=mode=@mode@>
+</if>
+
+
+<!-- COMENTARIOS ************************************************************************-->
+<if @nav_sel@ eq "comment">
+<include src="teacher_comments" &=user_id=@user_id@ &=mode=@mode@ &=comment_id=@comment_id@>
+</if>
+
+<!-- NOTAS *******************************************************************-->
+<if @nav_sel@ ne "ficha" and @nav_sel@ ne "comment" and @nav_sel@ ne 0>
+<include src="grades" &=user_id=@user_id@ &=mode=@mode@ &=note_id=@note_id@ &=nav_sel=@nav_sel@>
+</if>
+</div>
+
+</DIV>
+<BR><BR>
+<if @error@>
+<SCRIPT>
+eval ("@cambia@")
+eval("@senyala@" + "'#ffcc00'")
+alert("@msg_error@")
+</SCRIPT>
+</if>
Index: openacs-4/packages/cards/www/student_notes.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/student_notes.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/student_notes.tcl	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,156 @@
+ad_page_contract {
+}  -query {     
+  user_id:integer,notnull
+  {mode:optional ""}  
+  {note_id:integer,optional ""}
+  {note_grade:optional ""}
+  {note_comment:optional ""}
+  {note_type:integer,optional ""}
+  {note_act:boolean,optional ""}
+  {note_act_yes:integer,optional ""}
+  {nav_sel:optional ""}  
+  {mail_subject:optional ""}
+  {mail_body:optional ""}
+  {info_edit:optional ""}
+  {comment_id:optional ""}
+  {comment:optional ""}  
+  {teacher_comment:optional ""}  
+  
+} -properties {
+}
+
+# Declaraci� de variables a emprar
+set error 0
+set senyala ""
+set link_url ""
+set task_sel_edit ""
+set is_edit 0
+set info_edit 0
+set grade_avg 10
+set user_id $user_id
+set msg ""
+set nb 0
+
+# Comunitat a la que estem. Check if we are in a subcommunity. In this case, we use the big parent community.
+# but we only show the user cards that are in subgroup
+# Community and big parent community
+set community_selected [dotlrn_community::get_community_id]
+set community_name [cards::get_community_pretty_name -community_id $community_selected]
+set parent_community_id [cards::get_big_parent_community -community_id $community_selected]
+set reuse_parent_cards [cards::get_community_parameter -community_id $community_selected -param "ReuseParentCards"]
+if {$community_selected == $parent_community_id} {
+        set subgroup 0
+        set community_id $community_selected
+} else {
+        set subgroup 1
+        set community_id $community_selected
+        # If we reuse the cards we have to do the next actions, otherwise notihing to do
+        if {$reuse_parent_cards eq 1} {
+                set community_id $parent_community_id
+                set community_name [cards::get_community_pretty_name -community_id $community_id]
+                append  community_name " :: " [cards::get_community_pretty_name -community_id $community_selected]              
+        }
+}
+
+
+# Usuari que som y url a la que estem
+set card_id [cards::get_card_id -community_id $community_id -user_id $user_id]
+set my_user_id [ad_conn user_id]
+set referer [ns_conn url]
+
+# Si no som administradors  [admin_p = 0] --> error: permis denegat 
+set admin_p [dotlrn::user_can_admin_community_p -user_id $my_user_id -community_id $community_id]
+if {!$admin_p} {
+                        ad_return_error [lang::util::localize "#acs-subsite.Error#"] [lang::util::localize "#dotlrn.deniedpermission#"]         
+}
+
+# Envio de MAILS
+if {$mode eq "mail"} {  
+        db_1row get_teacher_mail { *SQL* }
+        db_1row get_student_mail { *SQL* }
+
+        ns_sendmail $student_email $teacher_email $mail_subject $mail_body
+        set mode ""
+        set datetime [clock_to_ansi [clock seconds]]
+        append comment "-> " $datetime ": " $mail_subject "<BR> " $mail_body    
+        db_dml update_last_sendmail { *SQL* } 
+}
+
+if {$mode eq "cancel"} {
+        set mode ""
+        set comment_id ""
+        set comment ""
+        
+}
+
+# Edicion de comentarios
+if {$mode eq "comment_edit"} {  
+        set comment_sel $comment_id
+}
+
+# Update de comentarios
+if {$mode eq "comment_update"} {        
+        set date [clock_to_ansi [clock seconds]]
+        db_dml update_comment { *SQL* } 
+        set mode ""
+        set comment_id ""
+}
+
+# Update de comentarios
+if {$mode eq "comment_delete"} {        
+        db_dml delete_comment { *SQL* }
+        set mode ""
+        set comment_id ""
+}
+
+# Insert de comentarios
+if {$mode eq "comment_insert"} {        
+        set date [clock_to_ansi [clock seconds]]
+        db_dml insert_comment { *SQL* } 
+        set msg "INSERT OK"
+        set mode ""
+        #ad_returnredirect "./student_notes?user_id=$user_id&nav_sel=$nav_sel"
+}
+
+#Update notes
+if {$mode eq "note_update"} {   
+        if {$note_act eq 1 || $note_act_yes eq 1} {
+                set note_actv 1 
+        } else {
+                set note_actv 0 
+        }
+        set date [clock_to_ansi [clock seconds]]
+        db_dml update_note { *SQL* } 
+        set mode ""
+        set note_id ""
+        #ad_returnredirect "./student_notes?user_id=$user_id&nav_sel=$nav_sel"
+}
+
+#Update teacher_comment
+if {$mode eq "teacher_update"} {        
+db_dml update_teacher_comment { *SQL* } 
+        set mode ""
+        set note_id ""
+        #ad_returnredirect "./student_notes?user_id=$user_id&nav_sel=$nav_sel"
+}
+
+
+set user_name [cards::get_student_name -user_id $user_id]
+db_multirow blocks select_blocks { *SQL* }
+
+ multirow foreach blocks {
+        set nb [expr $nb + 1]
+ }
+
+if {($nb eq 0) && ($nav_sel ne "comment")} {
+        set nav_sel "ficha"
+}
+ 
+ #if {$nav_sel ne "comments"} {
+#       if {$nb eq 0} {
+#       set nav_sel "ficha"
+#       }
+# }
+ 
+ set nbe [expr $nb + 3]
+
Index: openacs-4/packages/cards/www/student_notes.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/student_notes.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/student_notes.xql	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,84 @@
+
+<?xml version="1.0"?>
+
+<queryset>
+    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+        
+        <fullquery name="select_blocks">
+                <querytext>
+                        select * from card_percent
+                        where ref_community = :community_id
+                        order by percent desc
+            </querytext>
+    </fullquery>        
+
+<fullquery name="get_teacher_mail">
+    <querytext>
+                select email as teacher_email from acs_users_all where user_id = :my_user_id
+        </querytext>
+</fullquery>    
+
+
+
+<fullquery name="get_student_mail">
+    <querytext>
+                select email as student_email from acs_users_all where user_id = :user_id
+        </querytext>
+</fullquery>    
+
+
+<fullquery name="update_last_sendmail">
+    <querytext>
+                update card set 
+                comm_teacher = :comment
+                where ref_community = :community_id and
+                card_id = :card_id
+        </querytext>
+</fullquery>    
+
+
+        <fullquery name="insert_comment">
+        <querytext>
+                        insert into card_comment
+                        (ref_card, ref_community, date, date_mod, comment) 
+                        values(:card_id, :community_id, :date, :date, :comment) 
+                </querytext>
+    </fullquery>        
+        
+        
+        <fullquery name="update_comment">
+        <querytext>
+                        update card_comment
+                        set comment = :comment, date_mod = :date
+                        where comment_id = :comment_id          
+            </querytext>
+    </fullquery>        
+        
+        <fullquery name="delete_comment">
+        <querytext>
+                        delete from card_comment 
+                        where comment_id = :comment_id
+            </querytext>
+    </fullquery>
+
+        <fullquery name="update_note">
+        <querytext>
+                        update card_note
+                        set note_comment = :note_comment, date_mod = :date, grade = :note_grade, is_active= :note_actv
+                        where note_id = :note_id                
+            </querytext>
+    </fullquery>                
+
+        <fullquery name="update_teacher_comment">
+    <querytext>
+                update card set 
+                comm_teacher = :teacher_comment
+                where ref_community = :community_id and
+                card_id = :card_id
+        </querytext>
+        </fullquery>    
+
+
+        
+</queryset>
+
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/cards/www/teacher_comments.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/cards/www/teacher_comments.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/teacher_comments.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/teacher_comments.tcl	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,61 @@
+ad_page_contract {
+}  -query {     
+  user_id:integer,notnull
+  {mode:optional ""}  
+  {comment_id:optional ""}
+  {comment:optional ""}  
+} -properties {
+   comments:multirow
+}
+
+# Declaraci� de variables
+set widthheight_param "width=72 height=90"
+set export_vars [export_url_vars user_id]
+acs_user::get -user_id $user_id -array user_info
+set existe_photo 1
+set subsite_url [subsite::get_element -element url]
+set sel_comment $comment
+template::multirow create comments comment_id ref_card ref_community date date_mod comment
+
+# Comunitat a la que estem. Check if we are in a subcommunity. In this case, we use the big parent community.
+# but we only show the user cards that are in subgroup
+# Community and big parent community
+set community_selected [dotlrn_community::get_community_id]
+set community_name [cards::get_community_pretty_name -community_id $community_selected]
+set parent_community_id [cards::get_big_parent_community -community_id $community_selected]
+set reuse_parent_cards [cards::get_community_parameter -community_id $community_selected -param "ReuseParentCards"]
+if {$community_selected == $parent_community_id} {
+        set subgroup 0
+        set community_id $community_selected
+} else {
+        set subgroup 1
+        set community_id $community_selected
+        # If we reuse the cards we have to do the next actions, otherwise notihing to do
+        if {$reuse_parent_cards eq 1} {
+                set community_id $parent_community_id
+                set community_name [cards::get_community_pretty_name -community_id $community_id]
+                append  community_name " :: " [cards::get_community_pretty_name -community_id $community_selected]              
+        }
+}
+
+# Usuari que som y url a la que estem
+set card_id [cards::get_card_id -community_id $community_id -user_id $user_id]
+set my_user_id [ad_conn user_id]
+set referer [ns_conn url]
+
+# Si no som administradors  [admin_p = 0] --> error: permis denegat 
+set admin_p [dotlrn::user_can_admin_community_p -user_id $my_user_id -community_id $community_id]
+if {!$admin_p} {
+                        ad_return_error [lang::util::localize "#acs-subsite.Error#"] [lang::util::localize "#dotlrn.deniedpermission#"]         
+}
+
+set datetime [clock_to_ansi [clock seconds]]
+
+db_multirow comments select_comment { *SQL* } 
+
+
+
+if {$mode ne "comment_edit"} {
+        set comment_id ""
+        set mode ""
+}
Index: openacs-4/packages/cards/www/teacher_comments.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cards/www/teacher_comments.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/cards/www/teacher_comments.xql	22 Jun 2006 13:00:54 -0000	1.1
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<queryset>
+    <rdbms><type>postgresql</type><version>7.1</version></rdbms>        
+
+        <fullquery name="select_comment">
+        <querytext>
+                        select * from card_comment 
+                        where ref_card = :card_id and
+                        ref_community = :community_id
+                        order by comment_id
+            </querytext>
+    </fullquery>                
+        
+        <fullquery name="select_found_card">
+                <querytext>
+                        select * from card 
+                        where ref_user= :user_id and ref_community= :community_id
+                </querytext>
+        </fullquery>    
+
+
+</queryset>
+
+