Subversion Repositories eFlore/Applications.cel

Compare Revisions

Ignore whitespace Rev 3312 → Rev 3313

/trunk/widget/modules/apa/squelettes/arbres.tpl.html
68,22 → 68,22
</div>
</div>
<!-- TODO : Ajouter la logique d'affichage des relevés existants -->
<div class="control-group">
<!-- <div class="control-group">
<div id="releves-legende" class="col-sm-8 mb-2">
<p id="releves-streets">
<p id="releves-streets"> -->
<!-- #34BE27 -->
<i class="fas fa-check" aria-hidden="true" style="color: #34BE27"></i>&nbsp;sTREETs
<!-- <i class="fas fa-check" aria-hidden="true" style="color: #34BE27"></i>&nbsp;sTREETs
</p>
<p id="releves-lichens-go">
<p id="releves-lichens-go"> -->
<!-- #D5D242 -->
<i class="fas fa-check" aria-hidden="true" style="color: #D5D242"></i>&nbsp;Lichens&nbsp;Go!
<!-- <i class="fas fa-check" aria-hidden="true" style="color: #D5D242"></i>&nbsp;Lichens&nbsp;Go!
</p>
<p id="releves-les-deux">
<p id="releves-les-deux"> -->
<!-- #B2cb43 -->
<i class="fas fa-check-double" aria-hidden="true" style="color: #B2cb43"></i>&nbsp;sTREETs&nbsp;&&nbsp;Lichens&nbsp;Go!
<!-- <i class="fas fa-check-double" aria-hidden="true" style="color: #B2cb43"></i>&nbsp;sTREETs&nbsp;&&nbsp;Lichens&nbsp;Go!
</p>
</div>
</div>
</div> -->
 
</div>
 
102,42 → 102,40
<input type="date" id="releve-date" name="releve-date" class="form-control" max="<?php echo date('Y-m-d', time()); ?>" placeholder="jj/mm/aaaa" required>
</div>
</div>
<!-- à implémenter lorsqu'on saura transmettre l'info APA LG ou sTREETs-->
<?php // if ( $widget['streets'] ) : ?>
<div class="control-group">
<div class="col-sm-8 mb-2 list-label obligatoire">
<i class="fa fa-walking" aria-hidden="true"></i>
<?php echo $observation['zone-pietonne']; ?>
 
<div class="control-group">
<div class="col-sm-8 mb-2 list-label obligatoire">
<i class="fa fa-walking" aria-hidden="true"></i>
<?php echo $observation['zone-pietonne']; ?>
</div>
<div id="zone-pietonne" class="col-sm-8 mb-3 list">
<div class="form-check form-check-inline">
<input type="radio" id="pietonne" name="zone-pietonne" class="pietonne form-check-input" value="true">
<label for="pietonne" class="pietonne form-check-label"><?php echo $general['oui']; ?></label>
</div>
<div id="zone-pietonne" class="col-sm-8 mb-3 list">
<div class="form-check form-check-inline">
<input type="radio" id="pietonne" name="zone-pietonne" class="pietonne form-check-input" value="true">
<label for="pietonne" class="pietonne form-check-label"><?php echo $general['oui']; ?></label>
</div>
<div class="form-check form-check-inline">
<input type="radio" id="non-pietonne" name="zone-pietonne" class="non-pietonne form-check-input" value="false">
<label for="non-pietonne" class="non-pietonne form-check-label"><?php echo $general['non']; ?></label>
</div>
<div class="form-check form-check-inline">
<input type="radio" id="non-pietonne" name="zone-pietonne" class="non-pietonne form-check-input" value="false">
<label for="non-pietonne" class="non-pietonne form-check-label"><?php echo $general['non']; ?></label>
</div>
</div>
</div>
 
<div class="">
<div class="col-sm-8 mb-2 list-label">
<i class="fa fa-lightbulb" aria-hidden="true"></i>
<?php echo $observation['pres-lampadaires']; ?>
<div class="">
<div class="col-sm-8 mb-2 list-label">
<i class="fa fa-lightbulb" aria-hidden="true"></i>
<?php echo $observation['pres-lampadaires']; ?>
</div>
<div id="pres-lampadaires" class="col-sm-8 mb-3 list">
<div class="form-check form-check-inline">
<input type="radio" id="lampadaires" name="pres-lampadaires" class="lampadaires form-check-input" value="true">
<label for="lampadaires" class="lampadaires form-check-label"><?php echo $general['oui']; ?></label>
</div>
<div id="pres-lampadaires" class="col-sm-8 mb-3 list">
<div class="form-check form-check-inline">
<input type="radio" id="lampadaires" name="pres-lampadaires" class="lampadaires form-check-input" value="true">
<label for="lampadaires" class="lampadaires form-check-label"><?php echo $general['oui']; ?></label>
</div>
<div class="form-check form-check-inline">
<input type="radio" id="sans-lapadaires" name="pres-lampadaires" class="sans-lampadaires form-check-input" value="false">
<label for="sans-lampadaires" class="sans-lampadaires form-check-label"><?php echo $general['non']; ?></label>
</div>
<div class="form-check form-check-inline">
<input type="radio" id="sans-lapadaires" name="pres-lampadaires" class="sans-lampadaires form-check-input" value="false">
<label for="sans-lampadaires" class="sans-lampadaires form-check-label"><?php echo $general['non']; ?></label>
</div>
</div>
<?php // endif; ?>
</div>
 
<div class="">
<label for="commentaires" class="col-sm-8">
342,37 → 340,35
</div>
</div>
</div>
<!-- à implémenter lorsqu'on saura transmettre l'info APA LG ou sTREETs-->
<?php // if ( $widget['lg'] ) : ?>
<div id="face-ombre" class="control-group">
<div class="col-sm-8 mb-2 list-label obligatoire">
<i class="far fa-compass" aria-hidden="true"></i>
<?php echo $arbres['face-ombre']; ?>
 
<div id="face-ombre" class="control-group">
<div class="col-sm-8 mb-2 list-label obligatoire">
<i class="far fa-compass" aria-hidden="true"></i>
<?php echo $arbres['face-ombre']; ?>
</div>
<div class="col-sm-8 mb-3 has-tooltip list" data-toggle="tooltip" title="<?php echo $arbres['face-ombre-title']; ?>" required>
<div class="form-check form-check-inline">
<input type="checkbox" id="nord" name="face-ombre" class="nord form-check-input" value="nord">
<label for="nord" class="nord form-check-label"><?php echo $general['nord']; ?></label>
</div>
<div class="col-sm-8 mb-3 has-tooltip list" data-toggle="tooltip" title="<?php echo $arbres['face-ombre-title']; ?>" required>
<div class="form-check form-check-inline">
<input type="checkbox" id="nord" name="face-ombre" class="nord form-check-input" value="nord">
<label for="nord" class="nord form-check-label"><?php echo $general['nord']; ?></label>
</div>
<div class="form-check form-check-inline">
<input type="checkbox" id="sud" name="face-ombre" class="sud form-check-input" value="sud">
<label for="sud" class="sud form-check-label"><?php echo $general['sud']; ?></label>
</div>
<div class="form-check form-check-inline">
<input type="checkbox" id="est" name="face-ombre" class="est form-check-input" value="est">
<label for="est" class="est form-check-label"><?php echo $general['est']; ?></label>
</div>
<div class="form-check form-check-inline">
<input type="checkbox" id="ouest" name="face-ombre" class="ouest form-check-input" value="ouest">
<label for="ouest" class="ouest form-check-label"><?php echo $general['ouest']; ?></label>
</div>
<div class="form-check form-check-inline">
<input type="checkbox" id="aucune" name="face-ombre" class="ouest form-check-input" value="aucune">
<label for="aucune" class="aucune form-check-label"><?php echo $general['aucune']; ?></label>
</div>
<div class="form-check form-check-inline">
<input type="checkbox" id="sud" name="face-ombre" class="sud form-check-input" value="sud">
<label for="sud" class="sud form-check-label"><?php echo $general['sud']; ?></label>
</div>
<div class="form-check form-check-inline">
<input type="checkbox" id="est" name="face-ombre" class="est form-check-input" value="est">
<label for="est" class="est form-check-label"><?php echo $general['est']; ?></label>
</div>
<div class="form-check form-check-inline">
<input type="checkbox" id="ouest" name="face-ombre" class="ouest form-check-input" value="ouest">
<label for="ouest" class="ouest form-check-label"><?php echo $general['ouest']; ?></label>
</div>
<div class="form-check form-check-inline">
<input type="checkbox" id="aucune" name="face-ombre" class="ouest form-check-input" value="aucune">
<label for="aucune" class="aucune form-check-label"><?php echo $general['aucune']; ?></label>
</div>
</div>
<?php // endif; ?>
</div>
 
<div class="">
<label for="com-arbres" class="col-sm-8" title="">
421,7 → 417,7
<div id="bloc-controle-liste-obs" class="alert alert-info">
<h2 class="transmission-title"><strong><?php echo $resume['titre']; ?> <span class="obs-nbre badge badge-info">0</span></strong></h2>
<button id="transmettre-obs" class="btn btn-primary has-tooltip" data-toggle="tooltip" disabled="disabled"
title="<?php echo $resume['trans-title']; ?>" type="button" data-load="<?php echo ( $widget['streets'] || $widget['apa'] ) ? 'plantes' : 'lichens'; ?>">
title="<?php echo $resume['trans-title']; ?>" type="button">
<?php echo $general['enregistrer']; ?>
</button>
</div>
/trunk/widget/modules/apa/squelettes/apa.tpl.html
190,7 → 190,7
</div>
<!-- zone relevé -->
 
<!-- zone chargement lichens ou plantes -->
<!-- zone chargement arbres lichens ou plantes -->
<div id="charger-form" data-mode="<?php echo $conf_mode; ?>" data-load="arbres"></div>
<!-- fin zone chargement formulaire -->
 
/trunk/widget/modules/apa/squelettes/lichens.tpl.html
123,9 → 123,9
<form id="form-upload" class="form-horizontal" action="<?php echo $url_ws_upload ?>" method="post" enctype="multipart/form-data">
<div class="col-sm-8 mb-2 list-label and-help">
<i class="fa fa-images" aria-hidden="true"></i>
<?php echo $plantes['titre-photos']; ?>
<?php echo $lichens['titre-photos']; ?>
</div>
<p id="miniature-plantes-info" class="col-sm-8">
<p id="miniature-info" class="col-sm-8">
<?php echo $image['aide']; ?>
</p>
<div id ="photos-conteneur" class="control-group col-sm-8">
/trunk/widget/modules/apa/squelettes/plantes.tpl.html
153,7 → 153,7
<div id="bloc-controle-liste-obs" class="alert alert-info">
<h2 class="transmission-title"><strong><?php echo $resume['titre']; ?> <span class="obs-nbre badge badge-info">0</span></strong></h2>
<button id="transmettre-obs" class="btn btn-primary has-tooltip" data-toggle="tooltip" disabled="disabled"
title="<?php echo $resume['trans-title']; ?>" type="button" data-load="<?php echo ( $widget['streets'] || $widget['apa'] ) ? 'plantes' : 'lichens'; ?>">
title="<?php echo $resume['trans-title']; ?>" type="button">
<?php echo $general['enregistrer']; ?>
</button>
</div>
/trunk/widget/modules/apa/squelettes/js/WidgetApa.js
42,19 → 42,19
 
if( 'local' !== this.mode ) {
this.connexion( urlAuth, true );
if( $( '#utilisateur-connecte' ).hasClass( 'hidden' ) || !this.utils.valOk( $( '#nom-complet' ).text() ) ) {
var login = $( '#courriel' ).val(),
mdp = $( '#mdp' ).val();
if ( this.utils.valOk( login ) && this.utils.valOk( mdp ) ) {
urlAuth = this.urlBaseAuth + '/connexion?login=' + login + '&password=' + mdp;
$( '#connexion' ).click( function( event ) {
event.preventDefault();
lthis.connexion( urlAuth, true );
});
} else {
alert( lthis.utils.msgTraduction( 'non-connexion' ) );
$( '#connexion' ).click( function( event ) {
if( $( '#utilisateur-connecte' ).hasClass( 'hidden' ) || !this.utils.valOk( $( '#nom-complet' ).text() ) ) {
var login = $( '#courriel' ).val(),
mdp = $( '#mdp' ).val();
if ( this.utils.valOk( login ) && this.utils.valOk( mdp ) ) {
urlAuth = this.urlBaseAuth + '/connexion?login=' + login + '&password=' + mdp;
event.preventDefault();
lthis.connexion( urlAuth, true );
} else {
alert( lthis.utils.msgTraduction( 'non-connexion' ) );
}
}
}
});
} else {
urlAuth = this.urlRacine + '/widget:cel:modules/apa/test-token.json';
// $( '#connexion' ).click( function( event ) {
/trunk/widget/modules/apa/squelettes/js/PlantesApa.js
569,7 → 569,7
commentaires =
this.utils.msgTraduction( 'commentaires' ) +
' : <span>'+
datasObs.arbre.notes +
datasObs.plante.notes +
'</span> ';
}