Subversion Repositories eFlore/Applications.cel

Compare Revisions

Ignore whitespace Rev 3876 → Rev 3877

/trunk/widget/modules/saisie/squelettes/js/WidgetSaisie.js
34,6 → 34,7
this.infosEspeceImposee = widgetProp.infosEspeceImposee;
this.referentielImpose = widgetProp.referentielImpose;
this.isTaxonListe = widgetProp.isTaxonListe;
this.photoObligatoire = widgetProp.photoObligatoire;
}
this.urlRacine = window.location.origin;
this.obsNbre = 0;
617,18 → 618,28
 
 
WidgetSaisie.prototype.validerCertitudeTaxonImage = function( hasTaxon = false, hasImages = false ) {
if( 'certain' === $( '#certitude' ).val() ) {
return this.validerTaxonRequis( hasTaxon );
} else {
return this.validerImageRequise( hasImages );
const isCertain = 'certain' === $( '#certitude' ).val();
let isvalide = true ;
 
if ( this.photoObligatoire || !isCertain ) {
isvalide = this.validerImageRequise( hasImages );
}
if ( isCertain ) {
isvalide &= this.validerTaxonRequis( hasTaxon );
}
 
return isvalide;
 
 
};
 
WidgetSaisie.prototype.validerTaxonRequis = function( hasTaxon = false ) {
const taxonEstRequis = 'certain' === $( '#certitude' ).val();
 
$( '#photos-conteneur').removeClass( 'error' )
.find( 'span.error' ).hide();
if ( !this.photoObligatoire ) {
$( '#photos-conteneur').removeClass( 'error' )
.find( 'span.error' ).hide();
}
 
if ( !hasTaxon && taxonEstRequis ) {
this.afficherPanneau( '#dialogue-taxon-or-image' );
651,10 → 662,15
 
if ( hasImages ) {
this.masquerPanneau( '#dialogue-taxon-or-image' );
this.masquerPanneau( '#dialogue-image-requise' );
$( '#fichier' ).parent( 'label.label-file' ).removeClass( 'error' );
$( '#photos-conteneur').removeClass( 'error' ).find( 'span.error' ).hide();
} else {
this.afficherPanneau( '#dialogue-taxon-or-image' );
if ( this.photoObligatoire ) {
this.afficherPanneau( '#dialogue-image-requise' );
} else {
this.afficherPanneau( '#dialogue-taxon-or-image' );
}
$( '#fichier' ).parent( 'label.label-file' ).addClass( 'error' );
$( '#photos-conteneur').addClass( 'error' ).find( 'span.error' ).show();
}