Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@jonsito
jonsito committed Mar 22, 2017
2 parents 037ec47 + 2b53535 commit ecbf81b
Show file tree
Hide file tree
Showing 12 changed files with 169 additions and 162 deletions.
11 changes: 8 additions & 3 deletions agility/console/dialogs/dlg_chperros.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ $config =Config::getInstance();
</div>
<div class="fitem">
<label for="chperros-Genero"><?php _e('Gender'); ?>:</label>
<select id="chperros-Genero" name="Genero"style="width:75px">
<select id="chperros-Genero" name="Genero" style="width:75px">
<option value="-" selected="selected">-</option>
<option value="M"><?php _e('Male'); ?></option>
<option value="F"><?php _e('Female'); ?></option>
Expand Down Expand Up @@ -104,7 +104,11 @@ $config =Config::getInstance();

// datos del formulario de nuevo/edit perros
// - declaracion del formulario
$('#chperros-form').form();
$('#chperros-form').form({
onLoadSuccess: function(data) {
$('#chperros-Genero').combobox('setValue',data.Genero);
}
});
// - botones
addTooltip($('#chperros-clearBtn').linkbutton(),'<?php _e("Clear dog search to be re-assignated form"); ?>');
addTooltip($('#chperros-newBtn').linkbutton(),'<?php _e("Declare a new dog belonging to selected handler"); ?>');
Expand All @@ -113,6 +117,7 @@ $config =Config::getInstance();
$('#chperros-clearBtn').bind('click',function() {
$('#chperros-header').form('clear'); // empty form
$('#chperros-form').form('reset'); // restore to initial values
$('#chperros-Genero').combobox('setValue','-');
});

// campos del formulario
Expand Down Expand Up @@ -171,7 +176,7 @@ $config =Config::getInstance();
$('#chperros-Raza').textbox();
$('#chperros-LOE_RRC').textbox();
$('#chperros-Licencia').textbox();
$('#chperros-Genero').combobox({panelHeight:'auto'});
$('#chperros-Genero').combobox({valueField:'value',panelHeight:'auto'});

$('#chperros-Grados_Perro').combobox({
panelHeight: 'auto',
Expand Down
4 changes: 2 additions & 2 deletions agility/console/dialogs/dlg_jornadas.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ $config =Config::getInstance();
required: true,
validType: 'length[1,255]'
});
$('#jornadas-MangasPreAgility').combobox({panelHeight:'auto'});
$('#jornadas-MangasPreAgility').combobox({valueField:'value',panelHeight:'auto'});
$('#jornadas-MangasGrado1').combobox({
panelHeight:'auto',
valueField: 'value',
Expand All @@ -269,7 +269,7 @@ $config =Config::getInstance();
]
});

$('#jornadas-MangasEquipos').combobox({panelHeight:'auto'});
$('#jornadas-MangasEquipos').combobox({valueField:'value',panelHeight:'auto'});
$('#jornadas-Observaciones').textbox();

$('#jornadas-SlaveOf_List').combobox({
Expand Down
3 changes: 2 additions & 1 deletion agility/console/dialogs/dlg_perros.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ $config =Config::getInstance();
pg.combogrid('clear');
pg.combogrid('setValue',data.Guia);
pg.combogrid('setText',data.NombreGuia);
$('#perros-Genero').combobox('setValue',data.Genero);
}
});
// - botones
Expand Down Expand Up @@ -138,7 +139,7 @@ $config =Config::getInstance();
$('#perros-Raza').textbox();
$('#perros-LOE_RRC').textbox();
$('#perros-Licencia').textbox();
$('#perros-Genero').combobox({panelHeight:'auto'});
$('#perros-Genero').combobox({valueField:'value',panelHeight:'auto'});

$('#perros-Grados_Perro').combobox({
panelHeight: 'auto',
Expand Down
2 changes: 1 addition & 1 deletion agility/console/dialogs/dlg_usuarios.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ $config =Config::getInstance();
});
$('#usuarios-Gecos').textbox();
$('#usuarios-Phone').textbox();
$('#usuarios-Perms').combobox({panelHeight:'auto'});
$('#usuarios-Perms').combobox({valueField:'value',panelHeight:'auto'});

$('#usuarios-Club').combogrid({
panelWidth: 350,
Expand Down
32 changes: 16 additions & 16 deletions agility/console/dialogs/infomanga.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -348,28 +348,28 @@
$('#dmanga_ObstM').textbox({onChange:function(n,o){dmanga_setRecorridos();}});
$('#dmanga_ObstS').textbox({onChange:function(n,o){dmanga_setRecorridos();}});
$('#dmanga_ObstT').textbox({onChange:function(n,o){dmanga_setRecorridos();}});
$('#dmanga_TRS_L_Tipo').combobox({panelHeight:'auto',onChange:function(n,o){round_setUnit(n,'#dmanga_TRS_L_Unit')}});
$('#dmanga_TRS_M_Tipo').combobox({panelHeight:'auto',onChange:function(n,o){round_setUnit(n,'#dmanga_TRS_M_Unit')}});
$('#dmanga_TRS_S_Tipo').combobox({panelHeight:'auto',onChange:function(n,o){round_setUnit(n,'#dmanga_TRS_S_Unit')}});
$('#dmanga_TRS_T_Tipo').combobox({panelHeight:'auto',onChange:function(n,o){round_setUnit(n,'#dmanga_TRS_T_Unit')}});
$('#dmanga_TRS_L_Tipo').combobox({valueField:'value',panelHeight:'auto',onChange:function(n,o){round_setUnit(n,'#dmanga_TRS_L_Unit')}});
$('#dmanga_TRS_M_Tipo').combobox({valueField:'value',panelHeight:'auto',onChange:function(n,o){round_setUnit(n,'#dmanga_TRS_M_Unit')}});
$('#dmanga_TRS_S_Tipo').combobox({valueField:'value',panelHeight:'auto',onChange:function(n,o){round_setUnit(n,'#dmanga_TRS_S_Unit')}});
$('#dmanga_TRS_T_Tipo').combobox({valueField:'value',panelHeight:'auto',onChange:function(n,o){round_setUnit(n,'#dmanga_TRS_T_Unit')}});
$('#dmanga_TRS_L_Factor').textbox(); $('#dmanga_TRS_M_Factor').textbox();
$('#dmanga_TRS_S_Factor').textbox(); $('#dmanga_TRS_T_Factor').textbox();
$('#dmanga_TRS_L_Unit').combobox({panelHeight:'auto'});
$('#dmanga_TRS_M_Unit').combobox({panelHeight:'auto'});
$('#dmanga_TRS_S_Unit').combobox({panelHeight:'auto'});
$('#dmanga_TRS_T_Unit').combobox({panelHeight:'auto'});
$('#dmanga_TRS_L_Unit').combobox({valueField:'value',panelHeight:'auto'});
$('#dmanga_TRS_M_Unit').combobox({valueField:'value',panelHeight:'auto'});
$('#dmanga_TRS_S_Unit').combobox({valueField:'value',panelHeight:'auto'});
$('#dmanga_TRS_T_Unit').combobox({valueField:'value',panelHeight:'auto'});
$('#dmanga_TRS_L_TimeSpeed').textbox(); $('#dmanga_TRS_M_TimeSpeed').textbox();
$('#dmanga_TRS_S_TimeSpeed').textbox(); $('#dmanga_TRS_T_TimeSpeed').textbox();
$('#dmanga_TRM_L_Tipo').combobox({panelHeight:'auto',onChange:function(n,o){round_setUnit(n,'#dmanga_TRM_L_Unit')}});
$('#dmanga_TRM_M_Tipo').combobox({panelHeight:'auto',onChange:function(n,o){round_setUnit(n,'#dmanga_TRM_M_Unit')}});
$('#dmanga_TRM_S_Tipo').combobox({panelHeight:'auto',onChange:function(n,o){round_setUnit(n,'#dmanga_TRM_S_Unit')}});
$('#dmanga_TRM_T_Tipo').combobox({panelHeight:'auto',onChange:function(n,o){round_setUnit(n,'#dmanga_TRM_T_Unit')}});
$('#dmanga_TRM_L_Tipo').combobox({valueField:'value',panelHeight:'auto',onChange:function(n,o){round_setUnit(n,'#dmanga_TRM_L_Unit')}});
$('#dmanga_TRM_M_Tipo').combobox({valueField:'value',panelHeight:'auto',onChange:function(n,o){round_setUnit(n,'#dmanga_TRM_M_Unit')}});
$('#dmanga_TRM_S_Tipo').combobox({valueField:'value',panelHeight:'auto',onChange:function(n,o){round_setUnit(n,'#dmanga_TRM_S_Unit')}});
$('#dmanga_TRM_T_Tipo').combobox({valueField:'value',panelHeight:'auto',onChange:function(n,o){round_setUnit(n,'#dmanga_TRM_T_Unit')}});
$('#dmanga_TRM_L_Factor').textbox(); $('#dmanga_TRM_M_Factor').textbox();
$('#dmanga_TRM_S_Factor').textbox(); $('#dmanga_TRM_T_Factor').textbox();
$('#dmanga_TRM_L_Unit').combobox({panelHeight:'auto'});
$('#dmanga_TRM_M_Unit').combobox({panelHeight:'auto'});
$('#dmanga_TRM_S_Unit').combobox({panelHeight:'auto'});
$('#dmanga_TRM_T_Unit').combobox({panelHeight:'auto'});
$('#dmanga_TRM_L_Unit').combobox({valueField:'value',panelHeight:'auto'});
$('#dmanga_TRM_M_Unit').combobox({valueField:'value',panelHeight:'auto'});
$('#dmanga_TRM_S_Unit').combobox({valueField:'value',panelHeight:'auto'});
$('#dmanga_TRM_T_Unit').combobox({valueField:'value',panelHeight:'auto'});
$('#dmanga_Observaciones').textbox();

$('#dmanga_Juez1').combogrid({
Expand Down
Binary file added agility/images/logos/magic_aiglity_team.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion agility/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ function myRowStyler2(idx,row) { return pbRowStyler2(idx,row); }
<script type="text/javascript">

$('#public-form').form();
$('#public-Operation').combobox({panelHeight:'auto'});
$('#public-Operation').combobox({valueField:'value',panelHeight:'auto'});

$('#public-Prueba').combogrid({
panelWidth: 500,
Expand Down
2 changes: 1 addition & 1 deletion agility/livestream/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ function myLlamadaRowStyler(idx,row) {
//add 'callback' property to store interval references
$.extend($.fn.window.defaults,{callback:null});

$('#selvw-Vista').combobox({panelHeight:'auto',editable:false});
$('#selvw-Vista').combobox({valueField:'value',panelHeight:'auto',editable:false});

$('#selvw-dialog').dialog({
title: '<?php _e('View to deploy'); ?>',
Expand Down
4 changes: 2 additions & 2 deletions agility/server/auth/system.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ program_name = "AgilityContest"
author = "Juan Antonio Martinez"
email = "[email protected]"
license = "GPL"
version_name = "3.1.0"
version_date = "20170316_1517"
version_name = "3.1.1"
version_date = "20170322_1227"
database_name = "agility"
database_host = "localhost"
database_user = "YWdpbGl0eV9vcGVyYXRvcg=="
Expand Down
2 changes: 1 addition & 1 deletion agility/server/mail/MailManager.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ public function enumerateClubes() {
$result=$this->myDBObj->__select(
/* SELECT */ "ID,Nombre,Provincia,Pais,Federations,Email",
/* FROM */ "Clubes",
/* WHERE */ "$fedstr AND (ID>1) AND $where", // do not include default club in listing
/* WHERE */ "$fedstr AND (Baja=0) AND (ID>1) AND $where", // do not include default and outofbussines clubs in listing
/* ORDER BY */ "Nombre ASC",
/* LIMIT */ ""
);
Expand Down
2 changes: 1 addition & 1 deletion agility/videowall/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ function myLlamadaRowStyler(idx,row) {
//add 'callback' property to store interval references
$.extend($.fn.window.defaults,{callback:null});

$('#selvw-Vista').combobox({panelHeight:'auto',editable:false});
$('#selvw-Vista').combobox({valueField:'value',panelHeight:'auto',editable:false});

$('#selvw-dialog').dialog({
title: '<?php _e('View to deploy'); ?>',
Expand Down
Loading

0 comments on commit ecbf81b

Please sign in to comment.