Mejorar modelo.

[z.facultad/75.52/sercom.git] / sercom / widgets.py

diff --git a/sercom/widgets.py b/sercom/widgets.py
index b4b7e13f9093528112466290e057ee7095f1b8da..5a06ea71c92d41cabd58b913ef87167cd16e6414 100644 (file)
--- a/sercom/widgets.py
+++ b/sercom/widgets.py
@@ -21,23 +21,29 @@ class CustomTextField(widgets.TextField):
 
 AlumnoMultiSelectAjax = '''
 
-    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({'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 agregar_a_la_lista(texto, lista, loading)
     {
         t = MochiKit.DOM.getElement(texto);
 
@@ -54,11 +60,11 @@ 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);
+        d.addCallbacks(partial(_on_alumno_get_result, lista, loading), partial(_on_alumno_get_error, loading));
         t.value = "";
     }
 
@@ -80,14 +86,14 @@ AlumnoMultiSelectAjax = '''
 
 class AlumnoMultiSelect(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=" agregar_a_la_lista('${field_id}_nuevo', '${field_id}', '${name}_loading'); " />
+    </div>
+    <div>
     <select  
         multiple="multiple"  
         size="${size}"  
@@ -108,12 +114,12 @@ 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)]