Agrego correcciones

[software/sercom.git] / sercom / widgets.py

diff --git a/sercom/widgets.py b/sercom/widgets.py
index 218fb3aee343a4f21214c74dfc56670a8ac5600e..ba75c51bdefb01ff995eb8b59136fa58897ae32c 100644 (file)
--- a/sercom/widgets.py
+++ b/sercom/widgets.py
@@ -19,35 +19,27 @@ class CustomTextField(widgets.TextField):
         </span>
 '''
 
         </span>
 '''
 

-AlumnoMultiSelectAjax = '''
+MultiSelectAjax = '''

 
 

-    function _on_alumno_get_result(lista, results)
+    function _on_alumno_get_result(lista, loading, results)

     {
     {

+        load = MochiKit.DOM.getElement(loading);

         load.style.visibility = 'hidden';
         if (results.error) {
             alert(results.msg);
             return;
         }
         load.style.visibility = 'hidden';
         if (results.error) {
             alert(results.msg);
             return;
         }

-        MochiKit.DOM.appendChildNodes(lista, OPTION(results.msg));
+        MochiKit.DOM.appendChildNodes(lista, OPTION({'value':results.msg.id}, results.msg.value));
+        l = MochiKit.DOM.getElement(lista);

     }
 
     }
 

-    function _on_alumno_get_error(results)
+    function _on_alumno_get_error(loading, results)

     {
         alert(results)
     {
         alert(results)

+        load = MochiKit.DOM.getElement(loading);

         load.style.visibility = 'hidden';
     }
 
         load.style.visibility = 'hidden';
     }
 

-    function agregar_a_la_lista(texto, lista)
-    {
-        load = MochiKit.DOM.getElement('loading');
-        load.style.visibility = 'visible';
-        t = MochiKit.DOM.getElement(texto);
-        url = "/grupo/get_inscripto?cursoid=1&padron="+t.value;
-        var d = loadJSONDoc(url);
-        d.addCallbacks(partial(_on_alumno_get_result, lista), _on_alumno_get_error);
-        t.value = "";
-    }
-

     function sacar_de_la_lista(lista)
     {
         l = MochiKit.DOM.getElement(lista);
     function sacar_de_la_lista(lista)
     {
         l = MochiKit.DOM.getElement(lista);


@@ -62,18 +54,30 @@ AlumnoMultiSelectAjax = '''
         for (i=l.selectedIndex; i<l.options.length-1;i++)
             l.options[i] = l.options[i+1];
     }
         for (i=l.selectedIndex; i<l.options.length-1;i++)
             l.options[i] = l.options[i+1];
     }

+
+    function _do_add(callback, texto, lista, loading)
+    {
+        url = callback(texto, lista);
+        t = MochiKit.DOM.getElement(texto);
+
+        load = MochiKit.DOM.getElement(loading);
+        load.style.visibility = 'visible';
+        var d = loadJSONDoc(url);
+        d.addCallbacks(partial(_on_alumno_get_result, lista, loading), partial(_on_alumno_get_error, loading));
+    }
+

 '''
 
 '''
 

-class AlumnoMultiSelect(widgets.MultipleSelectField):
+class AjaxMultiSelect(widgets.MultipleSelectField):

     template = '''
     template = '''

-    <table xmlns:py="http://purl.org/kid/ns#" style="border:none; width:0%;">  
-    <tr><td>
-    <input type="text" id="${field_id}_nuevo" />
-    <img src="/static/images/loading.gif" align="baseline" style="visibility:hidden;" id="loading" width="16px" height="16px" />
+    <div style="width:250px" xmlns:py="http://purl.org/kid/ns#">  
+    <div>
+    <input type="text" id="${field_id}_nuevo" size="10" />
+    <img src="/static/images/loading.gif" align="baseline" style="visibility:hidden;" id="${name}_loading" width="16px" height="16px" />

     <input type="button" id="_agregar" value="Agregar"
     <input type="button" id="_agregar" value="Agregar"

-        onClick=" agregar_a_la_lista('${field_id}_nuevo', '${field_id}'); " />
-    </td></tr>
-    <tr><td>
+        onClick=" _do_add(${on_add}, '${field_id}_nuevo', '${field_id}', '${name}_loading'); " />
+    </div>
+    <div>

     <select  
         multiple="multiple"  
         size="${size}"  
     <select  
         multiple="multiple"  
         size="${size}"  


@@ -94,12 +98,17 @@ class AlumnoMultiSelect(widgets.MultipleSelectField):
         />  
         </optgroup>  
     </select>
         />  
         </optgroup>  
     </select>

-    </td></tr>
-    <tr><td align="center">
-    <input type="button" id="_sacar" value="Borrar"
+    </div>
+    <div align="center">
+    <input type="button" id="_sacar" value="Borrar" style="width:100%;"

         onClick="sacar_de_la_lista('${field_id}'); " />
         onClick="sacar_de_la_lista('${field_id}'); " />

-    </td></tr>
-    </table>
+    </div>
+    </div>

     '''
     '''

-    javascript = [widgets.JSSource(AlumnoMultiSelectAjax)]
+    javascript = [widgets.JSSource(MultiSelectAjax)]
+    on_add = "alert('Not defined action');"

 
 

+    def __init__(self, **kw):
+        self.params.append('on_add')
+        self.on_add = "alert('Not defined action');"
+        widgets.MultipleSelectField.__init__(self, **kw)