X-Git-Url: https://git.llucax.com/z.facultad/75.52/sercom.git/blobdiff_plain/af1e60da986a981abe314e8e53290593fc6c005f..f7a565ad20ac34bdc502aa591a9c95936fbf282f:/sercom/widgets.py

diff --git a/sercom/widgets.py b/sercom/widgets.py
index c3ccea5..5f9540c 100644
--- a/sercom/widgets.py
+++ b/sercom/widgets.py
@@ -19,26 +19,48 @@ class CustomTextField(widgets.TextField):
         </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;
         }
-        MochiKit.DOM.appendChildNodes(lista, OPTION(results.msg));
+        MochiKit.DOM.appendChildNodes(lista, OPTION({'value':results.msg.id}, results.msg.value));
+        l = MochiKit.DOM.getElement(lista);
+        for (i=0; i<l.options.length; i++) { 
+            l.options[i].selected = true; 
+        }
     }
 
-    function _on_alumno_get_error(results)
+    function _on_alumno_get_error(loading, results)
     {
         alert(results)
+        load = MochiKit.DOM.getElement(loading);
         load.style.visibility = 'hidden';
     }
 
-    function agregar_a_la_lista(texto, lista)
+    function sacar_de_la_lista(lista)
     {
+        l = MochiKit.DOM.getElement(lista);
+        if (l.selectedIndex < 0) return;
+        
+        /* caso especial, 1 solo item */
+        if (l.options.length == 1) {
+            l.options.length = 0
+            return;
+        }
+
+        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);
 
         /* Como no se si se puede hacer de otra manera, asumo que tengo en
@@ -54,40 +76,24 @@ AlumnoMultiSelectAjax = '''
             alert('Debes seleccionar un curso primero');
             return;
         }
-        load = MochiKit.DOM.getElement('loading');
+        load = MochiKit.DOM.getElement(loading);
         load.style.visibility = 'visible';
-        url = "/grupo/get_inscripto?cursoid="+curso.options[curso.selectedIndex].value+"&padron="+t.value;
         var d = loadJSONDoc(url);
-        d.addCallbacks(partial(_on_alumno_get_result, lista), _on_alumno_get_error);
-        t.value = "";
+        d.addCallbacks(partial(_on_alumno_get_result, lista, loading), partial(_on_alumno_get_error, loading));
     }
 
-    function sacar_de_la_lista(lista)
-    {
-        l = MochiKit.DOM.getElement(lista);
-        if (l.selectedIndex < 0) return;
-        
-        /* caso especial, 1 solo item */
-        if (l.options.length == 1) {
-            l.options.length = 0
-            return;
-        }
-
-        for (i=l.selectedIndex; i<l.options.length-1;i++)
-            l.options[i] = l.options[i+1];
-    }
 '''
 
-class AlumnoMultiSelect(widgets.MultipleSelectField):
+class AjaxMultiSelect(widgets.MultipleSelectField):
     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"
-        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}"  
@@ -108,12 +114,17 @@ class AlumnoMultiSelect(widgets.MultipleSelectField):
         />  
         </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}'); " />
-    </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)