Commit 03ec7ddb authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Amélioration du widget de filtrage

parent 3028680f
Loading
Loading
Loading
Loading
+25 −16
Changes for module/Application/view/application/statistique/index.phtml: 25 added lines, 16 removed lines.
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ function display_debug($texte) {
            values: [ 1998, 2018 ],
            slide: function( event, ui ) {
                $( "#amount" ).val( "" + ui.values[ 0 ] + " - " + ui.values[ 1 ] );
                $.prepUrl();
            }
        });
        $( "#amount" ).val( "" + $( "#slider-range" ).slider( "values", 0 ) +
@@ -131,7 +132,7 @@ function display_debug($texte) {
    } );
</script>

<script>
<script>SOURCE
    $(document).ready(function(){

        var date_type = $.urlParam('date_type');
@@ -142,18 +143,7 @@ function display_debug($texte) {

        $.resetForm(structure_type,structure_id,date_type,date_min,date_max);

        $('#filtrage_option').change(function() {
            var selected_structure_type = document.querySelector('input[name="structure_type"]:checked').value;
            var selected_structure_id = document.getElementById("structure_id").value;
            var selected_date_type = document.querySelector('input[name="date_type"]:checked').value;
            var selected_min = $( "#slider-range" ).slider( "values", 0 );
            var selected_max = $( "#slider-range" ).slider( "values", 1 );
            document.getElementById("linku").innerHTML = "" +
                "<a  href='/statistique?structure_type=" + selected_structure_type + "&structure_id=" + selected_structure_id + "&date_type="+ selected_date_type + "&date_min="+ selected_min + "&date_max="+ selected_max +"'> " +
                "<input type='button' class='btn btn-info' value='Filtrer les thèses'/>" +
                "</a>";
            //alert( this.value );
        });
        $('#filtrage_option').change(function() {$.prepUrl();});
        $('input[type=radio][name=structure_type]').change(function() {
            //alert(this.value);
            if (this.value == "Aucun") {
@@ -229,6 +219,19 @@ function display_debug($texte) {
        document.getElementById('structure_id').innerHTML = form;

    }

    $.prepUrl = function() {
        var selected_structure_type = document.querySelector('input[name="structure_type"]:checked').value;
        var selected_structure_id = document.getElementById("structure_id").value;
        var selected_date_type = document.querySelector('input[name="date_type"]:checked').value;
        var selected_min = $( "#slider-range" ).slider( "values", 0 );
        var selected_max = $( "#slider-range" ).slider( "values", 1 );
        document.getElementById("linku").innerHTML = "" +
            "<a  href='/statistique?structure_type=" + selected_structure_type + "&structure_id=" + selected_structure_id + "&date_type="+ selected_date_type + "&date_min="+ selected_min + "&date_max="+ selected_max +"'> " +
            "<input type='button' class='btn btn-info' value='Filtrer les thèses'/>" +
            "</a>";
        //alert( this.value );
    }
</script>

<?php
@@ -349,6 +352,7 @@ foreach($effectifsInscription[$end-2] as $these) {
}

$effectifParPays = generateEffectifParPays($effectifsInscription, $start, $end);
echo "{$homme}/{$femme}";
?>

<script> var do_drawing = true; </script>
@@ -373,7 +377,11 @@ $effectifParPays = generateEffectifParPays($effectifsInscription, $start, $end);
            pointSize: 5,
            hAxis: {
                slantedText:true,
                slantedTextAngle:45
                slantedTextAngle:45,
                //viewWindow: {
                //min: 5,
                //max: 2015
                //}
            },
            vAxis: {
                minValue: 0,
@@ -447,8 +455,9 @@ $effectifParPays = generateEffectifParPays($effectifsInscription, $start, $end);

        var data = google.visualization.arrayToDataTable([
            ['Genre', 'Effectif'],
            ['Femme',     <?php echo $femme; ?>],
            ['Homme',     <?php echo $homme; ?>]
            ['Homme',     <?php echo $homme; ?>],
            ['Femme',     <?php echo $femme; ?>]

        ]);

        var options = {