Commit a8e826b3 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

UP : Amélioration de la recherche dans l'écran de nouvelle organisation et... 

UP : Amélioration de la recherche dans l'écran de nouvelle organisation et réorganisation du champ nom complet
parent 35dd110a

module/Oscar/view/oscar/organization/form.phtml

+41 −31
Changes for module/Oscar/view/oscar/organization/form.phtml: 41 added lines, 31 removed lines.
Original line number Diff line number Diff line
@@ -37,10 +37,19 @@ 


    <ul class="errors">

        <?php foreach ($form->getMessages() as $msg): ?>

            <li><?= var_dump($msg) ?></li>

            <li><?= $msg ?></li>

        <?php endforeach; ?>

    </ul>



    <div id="completer">

        <div class="form-group">

            <div class="input-group input-group-lg">

                <span class="input-group-addon">Nom complet</span>

                <?= $this->formInput($form->get('fullName')) ?>

            </div>

            <?= $this->formElementErrors($form->get('fullName')); ?>

        </div>



        <div class="form-group" id="short">

            <div class="input-group input-group-lg">

                <span class="input-group-addon">Nom court / Acronyme</span>
@@ -48,9 +57,10 @@ 
                <?= $this->formElementErrors($form->get('shortName')); ?>

            </div>

        </div>

    </div>



    <div class="form-group">

        <div class="input-group input-group-lg">

        <div class="input-group input-group-sm">

            <span class="input-group-addon">Code interne</span>

            <?= $this->formInput($form->get('code')) ?>

            <?= $this->formElementErrors($form->get('code')); ?>
@@ -62,17 +72,6 @@ 
            <?= $this->formSelect($form->get('typeObj')) ?>

            <?= $this->formElementErrors($form->get('typeObj')); ?>

        </div>

        <?php /*

        <div class="input-group input-group-lg">

            <span class="input-group-addon">Type </span>

            <?= $this->formInput($form->get('type')) ?>

        </div>

        <datalist id="types">

            <?php foreach ($types as $type): ?>

            <option value="<?= $type ?>">

            <?php endforeach; ?>

        </datalist>

         */?>

    </div>



    <div class="form-group">
@@ -83,14 +82,6 @@ 
        </div>

    </div>



    <div class="form-group">

        <div class="input-group input-group-sm">

            <span class="input-group-addon">Nom complet</span>

            <?= $this->formInput($form->get('fullName')) ?>

        </div>

        <?= $this->formElementErrors($form->get('fullName')); ?>

    </div>



    <div class="form-group">

        <div class="input-group input-group-sm">

            <span class="input-group-addon">Date de début (ouverture)</span>
@@ -253,14 +244,18 @@ 
            new Vue({

                data: {

                  shortName: "",

                    fullName: "",

                    lastsearch: null,

                    show: true,

                    filter: "",

                    organizations: [{id: 1, label:"Test1"}, {id: 2, label:"Test2"}]

                    organizations: []

                },

                template: `<div class="input-group input-group-lg">

    <span class="input-group-addon">Nom court / Acronyme</span>

    <input type="text" class="form-control" v-model="shortName" name="shortName">

                template: `

<div>

<div class="form-group">

    <div class="input-group input-group-lg">

        <span class="input-group-addon">Nom complet</span>

        <input type="text" class="form-control" v-model="fullName" name="fullName">

        <span class="input-group-addon">

        <span v-show="filteredOrganizations.length && filter.length > 2" class="already">

            <span @click="show = !show">
@@ -282,10 +277,17 @@ 
        </section>

        </span>

        </span>



     </div>

</div>

<div class="form-group">

    <div class="input-group input-group-sm">

        <span class="input-group-addon">Nom court / Acronyme</span>

        <input type="text" class="form-control" v-model="shortName" name="shortName">

     </div>

    </div>

</div>`,



                el: "#short",

                el: "#completer",



                computed: {

                    filteredOrganizations(){
@@ -299,14 +301,13 @@ 
                    }

                },



                watch: {

                    shortName: function(newval, oldval){

                methods: {

                    triggerComplete: function(newval, oldval){

                        this.filter = newval;

                        if( newval.length > 2 ){

                            if( newval.indexOf(this.lastsearch) != 0 ){

                                console.log('Search for ', newval);

                                this.lastsearch = newval;

                                this.$http.get('/organization?q=' +newval).then(

                                this.$http.get('/organization?q=' +newval+'*').then(

                                    (success) => {

                                        this.organizations = success.data.datas;

                                    },
@@ -319,6 +320,15 @@ 
                            }

                        }

                    }

                },



                watch: {

                    fullName: function(newval, oldval){

                        this.triggerComplete(newval, oldval);

                    },

                    shortName: function(newval, oldval){

                        this.triggerComplete(newval, oldval);

                    }

                }

            })

        });

version-2.10.md

+1 −0
Changes for version-2.10.md: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ Les documents publiques peuvent maintenant être organisés en section. Les sect 


## FIX/ISSUES



 - Dans la fiche organisation (nouvelle organisation), le contrôle de l'existant utilise maintenant le nom complet et l'acronyme, le champ "Nom complet" a été placé en tête.

 - Les montants de la vue versement utilise maintenant l'espace comme séparateur des milliers.

 - L'affichage du temps écoulé des documents se base maintenant sur les minutes pour éviter l'affichage "Il y'a 11 heures sur un fichier déposé à n'importe quel moment de la journée"

 - La personne "uploadant" est correctement stoquée
 
 No newline at end of file