Commit 96d93bbe authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Fix Association d'activité au projet

parent 8bcdc3a8

ui/src/components/ActivityAutoCompleter.vue

+11 −1
Changes for ui/src/components/ActivityAutoCompleter.vue: 11 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
        <div class="autocomplete-left-icon">

          <i v-show="loading" class="icon-spinner animate-spin"></i>

          <i v-show="!loading && !noresult" class="icon-cube"></i>

          <i v-show="noresult" class="icon-user-times"></i>

          <i v-show="noresult" class="icon-block"></i>

        </div>



        <AutoComplete
@@ -18,7 +18,9 @@ 
          class="form-control-autocomplete activity-autocomplete"

          :placeholder="placeholder"

          @complete="handlerComplete"

          @input="handlerInput"

          @item-select="handlerItemSelect"

          @item-unselect="handlerClear"

          @clear="handlerClear"

        >

          <template #header>
@@ -175,7 +177,15 @@ export default { 
      this.$emit("input", selected);

    },



    handlerInput(evt){

      console.log(evt);

      if( this.selected && !evt.value ){

        this.handlerClear();

      }

    },



    handlerClear() {

      console.log("handlerClear");

      this.selected = null;

      this.$emit("change", null);

      this.$emit("selected", null);

ui/src/views/Activity.vue

+2 −2
Changes for ui/src/views/Activity.vue: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ 
              <span v-if="credentials.lock && credentials.lock_edit === false">

              <strong v-if="credentials.lock" class="btn btn-default disabled">

                <i class="icon-lock"></i>

                VERROUILLEE

                VERROUILLÉE

              </strong>

            </span>
@@ -206,7 +206,7 @@ 
              <li>

                <a class="dropdown-item" v-if="credentials.core.delete" :href="core.urls.delete">

                  <i class="icon-trash"></i>

                  Supprimer l'activité

                  {{ $filters.oscarText("Supprimer l'activité") }}

                </a>

              </li>

ui/src/views/Project.vue

+10 −3
Changes for ui/src/views/Project.vue: 10 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -145,8 +145,15 @@ export default { 
    },



    handlerSelectActivityToAdd(selectedActivity){

      console.log(selectedActivity);

      this.addedActivity = selectedActivity;

    },



    handlerUnselect(){

      this.addedActivity = null;

    }





  }

}

</script>
@@ -325,11 +332,11 @@ export default { 
        <Dialog v-model:visible="displayUiAddActivity" modal header=" " :style="{ width: '60%' }">

          <section>

            Ajouter une activité existante

            <ActivityAutoCompleter v-model="addedActivity" @selected="handlerSelectActivityToAdd"/>

            <ActivityAutoCompleter v-model="addedActivity" @selected="handlerSelectActivityToAdd" @remove="handlerUnselect"/>

          </section>

          <pre>{{ addedActivity }}</pre>

          <pre>{{ addedActivity?.id }}</pre>

          <div class="flex justify-end gap-2">

            <Button type="button" label="Annuler" severity="secondary" @click="displayUiAddActivity = false"></Button>

            <Button type="button" label="Annuler" severity="secondary" @click="addedActivity = null; displayUiAddActivity = false"></Button>

            <Button type="button" label="Enregistrer" @click="handlerAddActivity"></Button>

          </div>

        </Dialog>