Subversion Repositories eFlore/Applications.cel

Compare Revisions

Ignore whitespace Rev 3346 → Rev 3347

/trunk/widget/modules/saisie2/Saisie2.php
185,10 → 185,11
}
 
if ( isset( $retour[$projet]['champs-supp'][$key]['fieldValues']['listValue'] ) ) {
foreach( $retour[$projet]['champs-supp'][$key]['fieldValues']['listValue'] as $list_key => $list_value ) {
$retour[$projet]['champs-supp'][$key]['fieldValues']['listValue'][$list_key] = $this->clean_string( $list_value );
foreach( $retour[$projet]['champs-supp'][$key]['fieldValues']['listValue'] as $list_key => $list_value_array ) {
$retour[$projet]['champs-supp'][$key]['fieldValues']['listValue'][$list_key][0] = $this->clean_string( $list_value_array[0] );
// Obtenir une liste de valeurs utilisables dans les attributs for id ou name par exemple
$retour[$projet]['champs-supp'][$key]['fieldValues']['cleanListValue'][] = 'val-' . preg_replace( '/[^A-Za-z0-9_\-]/', '', $this->remove_accents( $list_value ) );
$retour[$projet]['champs-supp'][$key]['fieldValues']['listValue'][$list_key][1] = $this->clean_string( $list_value_array[1] );
}
}
}
/trunk/widget/modules/saisie2/squelettes/saisie.tpl.html
426,20 → 426,20
</div>
<div class="col-sm-8 has-tooltip" <?php echo $description; ?>>
 
<?php foreach ( $champ['fieldValues']['listValue'] as $i => $list_value ) : ?>
<?php foreach ( $champ['fieldValues']['listValue'] as $i => $list_value_array ) : ?>
 
<?php
$checked = '';
if ( '#' === substr( $list_value, -1 ) ) :
if ( '#' === substr( $list_value_array[0], -1 ) ) :
$checked = ' checked';
$list_value = substr( $list_value, 0, -1 );
$list_value_array[0] = substr( $list_value_array[0], 0, -1 );
endif;
?>
 
<?php if( 'other' !== $list_value ) : ?>
<?php if( 'other' !== $list_value_array ) : ?>
<label for="<?php echo $champ['fieldValues']['cleanListValue'][$i]; ?>" class="<?php echo $champ['fieldValues']['cleanListValue'][$i]; ?>">
<input type="<?php echo $champ['element']; ?>" id="<?php echo $champ['fieldValues']['cleanListValue'][$i]; ?>" name="<?php echo $champ['key']; ?>[]" value="<?php echo $list_value; ?>"<?php echo $checked; ?> class="<?php echo $champ['fieldValues']['cleanListValue'][$i] . ' ' . $champ['key']; ?>" data-label="<?php echo $champ['name']; ?>" data-name="<?php echo $champ['key']; ?>">
<?php echo $list_value; ?>
<input type="<?php echo $champ['element']; ?>" id="<?php echo $champ['fieldValues']['cleanListValue'][$i]; ?>" name="<?php echo $champ['key']; ?>[]" value="<?php echo $list_value_array[0]; ?>"<?php echo $checked; ?> class="<?php echo $champ['fieldValues']['cleanListValue'][$i] . ' ' . $champ['key']; ?>" data-label="<?php echo $champ['name']; ?>" data-name="<?php echo $champ['key']; ?>">
<?php echo ( '' !== $list_value_array[1] ) ? ucfirst($list_value_array[1]) : ucfirst($list_value_array[0]); ?>
</label>
<?php else : ?>
<label for="other-<?php echo $champ['key']; ?>">
467,20 → 467,20
<div class="overSelect"></div>
</div>
<div class="checkboxes hidden" <?php echo $required; ?> data-name="<?php echo $champ['key']; ?>[]">
<?php foreach ( $champ['fieldValues']['listValue'] as $i => $list_value ) : ?>
<?php foreach ( $champ['fieldValues']['listValue'] as $i => $list_value_array ) : ?>
 
<?php
$checked = '';
if ( '#' === substr( $list_value, -1 ) ) :
if ( '#' === substr( $list_value_array[0], -1 ) ) :
$checked = ' checked';
$list_value = substr( $list_value, 0, -1 );
$list_value_array[0] = substr( $list_value_array[0], 0, -1 );
endif;
?>
 
<?php if( 'other' !== $list_value ) : ?>
<?php if( 'other' !== $list_value_array ) : ?>
<label for="<?php echo $champ['fieldValues']['cleanListValue'][$i]; ?>">
<input type="checkbox" id="<?php echo $champ['fieldValues']['cleanListValue'][$i]; ?>" name="<?php echo $champ['key']; ?>[]" value="<?php echo $list_value; ?>"<?php echo $checked; ?> class="<?php echo $champ['fieldValues']['cleanListValue'][$i] . ' ' . $champ['key']; ?>" data-label="<?php echo $champ['name']; ?>" data-name="<?php echo $champ['key']; ?>">
<?php echo $list_value; ?>
<input type="checkbox" id="<?php echo $champ['fieldValues']['cleanListValue'][$i]; ?>" name="<?php echo $champ['key']; ?>[]" value="<?php echo $list_value_array[0]; ?>"<?php echo $checked; ?> class="<?php echo $champ['fieldValues']['cleanListValue'][$i] . ' ' . $champ['key']; ?>" data-label="<?php echo $champ['name']; ?>" data-name="<?php echo $champ['key']; ?>">
<?php echo ( '' !== $list_value_array[1] ) ? ucfirst($list_value_array[1]) : ucfirst($list_value_array[0]); ?>
</label>
<?php else : ?>
<label for="other-<?php echo $champ['key']; ?>">
503,19 → 503,20
<div class="select-wrapper add-field-select <?php echo $help; ?>">
<select id="<?php echo $champ['key']; ?>" class="<?php echo $champ['key'] . ' ' . $champ['element']; ?> form-control has-tooltip custom-select mb-2"<?php echo $required; ?> data-label="<?php echo $champ['name']; ?>" data-name="<?php echo $champ['key']; ?>" <?php echo $description; ?>>
 
<?php foreach ( $champ['fieldValues']['listValue'] as $list_value ) : ?>
<?php foreach ( $champ['fieldValues']['listValue'] as $list_value_array ) : ?>
 
<?php
var_dump($list_value_array[0]);
$selected = '';
if ( '#' === substr( $list_value, -1 ) ) :
if ( '#' === substr( $list_value_array[0], -1 ) ) :
$selected = ' selected="selected"';
$list_value = substr( $list_value, 0, -1 );
$list_value_array[0] = substr( $list_value_array[0], 0, -1 );
endif;
?>
 
<?php if( 'other' !== $list_value ) : ?>
<option value="<?php echo $list_value; ?>"<?php echo $selected; ?> data-name="<?php echo $champ['key']; ?>">
<?php echo ucfirst( $list_value ); ?>
<?php if( 'other' !== $list_value_array ) : ?>
<option value="<?php echo $list_value_array[0]; ?>"<?php echo $selected; ?> data-name="<?php echo $champ['key']; ?>">
<?php echo ( '' !== $list_value_array[1] ) ? ucfirst($list_value_array[1]) : ucfirst($list_value_array[0]); ?>
</option>
<?php else : ?>
<option id="other-<?php echo $champ['key']; ?>" class="other form-control is-select" value="other" data-element="<?php echo $champ['element']; ?>" data-name="<?php echo $champ['key']; ?>">Autre</option>