Bugfix: ahora CasoDePrueba almacena el comando completo, no sólo los parámetros.

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

diff --git a/sercom/widgets.py b/sercom/widgets.py
index 5f9540c531d26bdfd1e38792874b15ee0336a97b..b9a14c1769808eea4e40e0f48d18dcfea4e8ae73 100644 (file)
--- a/sercom/widgets.py
+++ b/sercom/widgets.py
@@ -31,9 +31,6 @@ MultiSelectAjax = '''
         }
         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(loading, results)
@@ -45,17 +42,9 @@ MultiSelectAjax = '''
 
     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];
+        replaceChildNodes(lista,
+            list(ifilterfalse(itemgetter('selected'), $(lista).options))
+        );
     }
 
     function _do_add(callback, texto, lista, loading)
@@ -63,32 +52,23 @@ MultiSelectAjax = '''
         url = callback(texto, lista);
         t = MochiKit.DOM.getElement(texto);
 
-        /* Como no se si se puede hacer de otra manera, asumo que tengo en
-         * el form un Combo que se llama curso en el codigo, y tiro error si
-         * no existe
-         */
-        curso = MochiKit.DOM.getElement('form_cursoID');
-        if (!curso) {
-            alert("No deberias ver esto, y quiere decir que tu form esta roto.\\nTe falta un combo de curso");
-            return;
-        }
-        if (curso.options[curso.selectedIndex].value <= 0) {
-            alert('Debes seleccionar un curso primero');
-            return;
-        }
         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));
+        t.value = 'padron';
+        t.style.color = "#aaa";
     }
-
 '''
 
 class AjaxMultiSelect(widgets.MultipleSelectField):
     template = '''
     <div style="width:250px" xmlns:py="http://purl.org/kid/ns#">  
     <div>
-    <input type="text" id="${field_id}_nuevo" size="10" />
+    <input type="text" id="${field_id}_nuevo" size="10" value="padron"
+        style="color:#aaa;"
+        onfocus="this.style.color='#000'; if (this.value =='padron') { this.value=''; }"
+        onblur="if (this.value == '') { this.style.color='#aaa'; this.value='padron'; }" />
     <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=" _do_add(${on_add}, '${field_id}_nuevo', '${field_id}', '${name}_loading'); " />
@@ -128,3 +108,77 @@ class AjaxMultiSelect(widgets.MultipleSelectField):
         self.params.append('on_add')
         self.on_add = "alert('Not defined action');"
         widgets.MultipleSelectField.__init__(self, **kw)
+
+DosListasAjax = '''
+    function makeOption(option) {
+        return OPTION({"value": option.value}, option.text);
+    }
+
+    function moveOption( fromSelect, toSelect) {
+        // add 'selected' nodes toSelect
+        appendChildNodes(toSelect,
+            map( makeOption,ifilter(itemgetter('selected'), $(fromSelect).options)));
+        // remove the 'selected' fromSelect
+        replaceChildNodes(fromSelect,
+            list(ifilterfalse(itemgetter('selected'), $(fromSelect).options))
+        );
+    }
+
+'''
+
+class AjaxDosListasSelect(widgets.MultipleSelectField):
+    template = '''
+    <div xmlns:py="http://purl.org/kid/ns#">  
+    <table style="border:0; margin:0px; border-spacing:0px 0px">
+    <tr class="nada">
+        <td style="padding:0 0 0 0;" align="center">${title_from}</td>
+        <td>&nbsp;</td>
+        <td style="padding:0 0 0 0;" align="center">${title_to}</td>
+    </tr>
+    <tr class="nada">
+    <td style="padding:0 0 0 0;">
+    <select  
+        multiple="multiple"
+        size="${size}"
+        class="${field_class}"
+        name="${name}_from"
+        id="${field_id}_from"
+        py:attrs="attrs"
+        style="width:200px;">
+        <optgroup py:for="group, options in grouped_options" label="${group}" py:strip="not group">
+        <option py:for="value, desc, attrs in options" value="${value}" py:attrs="attrs" py:content="desc" />  
+        </optgroup>  
+    </select>
+    </td>
+    <td style="padding:0 10px 0 10px;" valign="center" align="center">
+        <input type="button" value="&gt;&gt;&gt;" style="font-size:90%;" onClick="moveOption('${field_id}_from', '${field_id}_to');" />
+        <br />
+        <br />
+        <input type="button" value="&lt;&lt;&lt;" style="font-size:90%;" onClick="moveOption('${field_id}_to', '${field_id}_from');" />
+    </td>
+    <td style="padding:0 0 0 0;">
+    <select  
+        multiple="multiple"
+        size="${size}"
+        name="${name}_to"
+        class="${field_class}"
+        id="${field_id}_to"
+        py:attrs="attrs"
+        style="width:200px;">
+    </select>
+    </td>
+    </tr>
+    </table>
+    </div>
+    '''
+    javascript = [widgets.JSSource(DosListasAjax)]
+    title_from = ""
+    title_to = ""
+
+    def __init__(self, **kw):
+        self.params.append('title_from')
+        self.params.append('title_to')
+        self.title_from = "&nbsp;"
+        self.title_to = "&nbsp;"
+        widgets.MultipleSelectField.__init__(self, **kw)
+