Commit a94c42db authored by Jerome Chauveau's avatar Jerome Chauveau
Browse files

nouveau correctif comptage sélection multiple + proposition UI vignette de collection.

parent 2a03f81c

src/components/JamaActionsToolbar.vue

+12 −8
Original line number Diff line number Diff line
@@ -136,21 +136,25 @@ export default { 
    selectedCollections(after, before) {

      if (after.length < before.length)

        this.allSelected = false;

      if(this.batchMode) {

        let removed = before.filter(x => !after.includes(x)).map((e) => e.id);

        let added = after.filter(x => !before.includes(x)).map((e) => e.id);

        this.excludedCollectionIds = this.excludedCollectionIds.concat(removed);

        this.excludedCollectionIds = this.excludedCollectionIds.filter((c) => added.indexOf(c) < 0);

      }



    },



    selectedResources(after, before) {

      if (after.length < before.length)

        this.allSelected = false;

      if(this.batchMode) {

        let removed = before.filter(x => !after.includes(x)).map((e) => e.id);

        let added = after.filter(x => !before.includes(x)).map((e) => e.id);

        this.excludedResourceIds = this.excludedResourceIds.concat(removed);

        this.excludedResourceIds = this.excludedResourceIds.filter((c) => added.indexOf(c) < 0);

      }

    }

  },



  computed: {

src/components/JamaCollectionTile.vue

+63 −8
Original line number Diff line number Diff line
@@ -10,7 +10,15 @@ 
              @click="select()"

              @dragover.prevent

              @drop.prevent="dropped($event)">



        <v-img

            v-if="collection.represented_by"

            height="80"

            :src="collection.represented_by.urls.m"></v-img>

        <div v-else></div>



        <v-icon color="amber lighten-1">mdi-folder</v-icon>



        <v-card-title class="grey--text body-2">

          {{ label }}

        </v-card-title>
@@ -19,6 +27,42 @@ 
  </v-hover>

</template>





<!--<template>-->

<!--  <v-hover>-->

<!--    <template v-slot:default="{ hover }">-->

<!--      <v-card :id="collection.title" draggable height="200"-->

<!--              :title="collection.title"-->

<!--              class="clickable d-flex flex-column justify-space-between collection-tile"-->

<!--              :data-metas="metaAttrValues"-->

<!--              :elevation="hover ? 24 : 1"-->

<!--              @dragstart="dragStarted($event)"-->

<!--              @click="select()"-->

<!--              @dragover.prevent-->

<!--              @drop.prevent="dropped($event)">-->

<!--        <v-icon color="amber lighten-1">mdi-folder</v-icon>-->

<!--        <div  v-if="collection.represented_by" class="collection-avatar">-->

<!--          <v-avatar-->

<!--                    size="72"-->

<!--                    class="profile"-->

<!--                    tile-->

<!--          >-->

<!--            <img-->

<!--                alt="Avatar"-->

<!--                :src="collection.represented_by.urls.m"-->

<!--            >-->

<!--          </v-avatar>-->

<!--        </div>-->



<!--        <v-card-title class="grey&#45;&#45;text body-2">-->

<!--          {{ label }}-->

<!--        </v-card-title>-->

<!--      </v-card>-->

<!--    </template>-->

<!--  </v-hover>-->

<!--</template>-->





<script>



export default {
@@ -74,21 +118,32 @@ export default { 


.jama-collection-card-text {

  position: relative;



  .v-avatar {

    position: absolute;

    bottom: 2px;

    right: 2px;

  }

}



.collection-tile {

  display: flex;

  align-items: center;

  justify-content: center;

  position: relative !important;



  .collection-avatar {

    position: absolute;

    width: 100%;

    height: 80%;

    display: flex;

    justify-content: center;

    align-items: center;

  }



  .mdi-folder {

    font-size: 128px;

  }



  .v-icon {

    position: absolute;

    top: 0;

  }

}





</style>

src/components/widgets/DropCard.vue

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
            @dragexit.prevent="dropMode = false"

            @drop.prevent="fileDropped($event)"

            @dragover.prevent>

        <p class="text-center ma-4 text-body-2">

        <p class="text-center ma-4 text-sm-body-2 text-lg-body-2">

            <template v-if="all">

                {{$t('all')}}

            </template>