Skip to content

Commit

Permalink
When several images are attached to a work, the general layout of the…
Browse files Browse the repository at this point in the history
… page can be broken. Now the imagesFileUpload has a max-height that render a scroll bar if necessary.

Added some logs related with the detist creation to detect duplication issues.
  • Loading branch information
alcastrob committed Feb 21, 2020
1 parent a588d9a commit cc01774
Show file tree
Hide file tree
Showing 6 changed files with 249 additions and 254 deletions.
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "labmanager",
"version": "1.0.19",
"version": "1.0.20",
"author": "Angel Castro <al.castro@gmail.com>",
"description": "An application for managing a dental prosthetic laboratory",
"license": "MIT",
Expand Down
111 changes: 56 additions & 55 deletions src/renderer/components/PageElements/fileUploads/imagesFileUplodad.vue
Original file line number Diff line number Diff line change
@@ -1,59 +1,55 @@
<template>
<div class>
<div class="row">
<fileUploadBase class="col-md-12" type="image/*" :multipleFiles="true" ref="fileUpload"></fileUploadBase>
</div>
<!-- row -->
<div class="row text-center text-lg-left">
<div
class="col-md-4 pb-3 text-center"
v-for="(image, idx) in imageArray"
v-bind:key="image.path"
>
<a href="#" class="mb-4" @click="viewImage(image.content, idx)">
<img
class="img-fluid img-thumbnail thumbnail"
:src="image.content"
title="Haga click para visualizar"
>
</a>
<button
class="btn btn-secondary btn-sm"
title="Descargar la imagen al ordenador"
@click="downloadImage(image)"
>
<i class="fas fa-download"></i>
</button>
<button
class="btn btn-secondary btn-sm"
title="Borrar la imagen"
@click="deleteImage(image)"
>
<i class="fas fa-times-circle"></i>
</button>
</div>
<!-- col-md-4 -->
</div>
<!-- row -->
<b-carousel
id="carousel1"
ref="carousel1"
controls
indicators
background="#ababab"
:interval="0"
v-model="currentSlide"
class="overlay"
:class="{'displayNone': !fullscreen}"
>
<b-carousel-slide
v-for="(image, idx) in imageArray"
:img-src="imageArray[idx].content"
v-bind:key="'b-' + idx"
@clidk="exitFullscreen"
></b-carousel-slide>
</b-carousel>
</div>
<div class>
<div class="row">
<fileUploadBase class="col-md-12" type="image/*" :multipleFiles="true" ref="fileUpload"></fileUploadBase>
</div>
<!-- row -->
<div class="row text-center text-lg-left max200">
<div
class="col-md-4 pb-3 text-center"
v-for="(image, idx) in imageArray"
v-bind:key="image.path"
>
<a href="#" class="mb-4" @click="viewImage(image.content, idx)">
<img
class="img-fluid img-thumbnail thumbnail"
:src="image.content"
title="Haga click para visualizar"
/>
</a>
<button
class="btn btn-secondary btn-sm"
title="Descargar la imagen al ordenador"
@click="downloadImage(image)"
>
<i class="fas fa-download"></i>
</button>
<button class="btn btn-secondary btn-sm" title="Borrar la imagen" @click="deleteImage(image)">
<i class="fas fa-times-circle"></i>
</button>
</div>
<!-- col-md-4 -->
</div>
<!-- row -->
<b-carousel
id="carousel1"
ref="carousel1"
controls
indicators
background="#ababab"
:interval="0"
v-model="currentSlide"
class="overlay"
:class="{'displayNone': !fullscreen}"
>
<b-carousel-slide
v-for="(image, idx) in imageArray"
:img-src="imageArray[idx].content"
v-bind:key="'b-' + idx"
@clidk="exitFullscreen"
></b-carousel-slide>
</b-carousel>
</div>
</template>

<script>
Expand Down Expand Up @@ -207,4 +203,9 @@ img.thumbnail {
background: rgba(51, 51, 51, 0.7);
z-index: 100;
}
.max200 {
max-height: 200px;
overflow-y: scroll;
}
</style>
Loading

0 comments on commit cc01774

Please sign in to comment.