774,10 → 774,8 |
'individusNbre', |
function (value, element) { |
var ok = true; |
console.log( 'nbre:'+value+'-'); |
if (afficherIndividusNbreGroupe()) { |
var abondance = $('#abondance').val(); |
console.log('abondance:'+abondance+' - nbre:'+value); |
if (abondance === '1-4 individus') { |
ok = value === '' || (value !== '' && /^[0-9]+$/.test(value) && value >= 1 && value < 5); |
} else if (abondance == '5-9 individus') { |
1032,7 → 1030,7 |
function getTextOptionSelectionne(id) { |
var optionVal = $('#' + id).val(), |
optionText = $('#' + id + ' option:selected').text(); |
console.log(optionVal+'-'+optionText); |
//console.log(optionVal+'-'+optionText); |
return ((optionVal === undefined || optionVal === '') ? '' : optionText); |
} |
|
Property changes: |
Added: svn:mergeinfo |
Merged /branches/v1.5-cisaille/widget/modules/saisie/squelettes/missions-flore/js/missions-flore.js:r798-1342 |
Merged /branches/v2.7-grelinette/widget/modules/saisie/squelettes/missions-flore/js/missions-flore.js:r2439 |
Merged /branches/v1.7-croissant/widget/modules/saisie/squelettes/missions-flore/js/missions-flore.js:r1855,1885-1886,1895,1983 |
Merged /branches/topic-dbsingleton/widget/modules/saisie/squelettes/missions-flore/js/missions-flore.js:r1720-1764 |
Merged /branches/v1.8-debroussailleuse/widget/modules/saisie/squelettes/missions-flore/js/missions-flore.js:r1987,1992 |