admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in release/2023-04-21 (pull request #710)

Browse Source 
Release/2023 04 21
This commit is contained in:
Patrick Fic
2023-04-19 18:44:50 +00:00
parent 357f40bdc2 d787821345
commit c0d9bacf1d
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/components/jobs-documents-gallery/jobs-documents-gallery.component.jsx
View File

@@ -34,8 +34,8 @@ function JobsDocumentsComponent({
const fileType = DetermineFileType(value.type); const fileType = DetermineFileType(value.type);
if (value.type.startsWith("image")) { if (value.type.startsWith("image")) {
acc.images.push({ acc.images.push({
src: GenerateSrcUrl(value), // src: GenerateSrcUrl(value),
thumbnail: GenerateThumbUrl(value), src: GenerateThumbUrl(value),
// src: GenerateSrcUrl(value), // src: GenerateSrcUrl(value),
// thumbnail: GenerateThumbUrl(value), // thumbnail: GenerateThumbUrl(value),
fullsize: GenerateSrcUrl(value), fullsize: GenerateSrcUrl(value),

6
client/src/components/jobs-documents-gallery/jobs-documents-gallery.external.component.jsx
View File

@@ -1,7 +1,7 @@
import React, { useEffect } from "react"; import React, { useEffect } from "react";
import { Gallery } from "react-grid-gallery"; import { Gallery } from "react-grid-gallery";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { GenerateSrcUrl, GenerateThumbUrl } from "./job-documents.utility"; import { GenerateThumbUrl } from "./job-documents.utility";
function JobsDocumentGalleryExternal({ function JobsDocumentGalleryExternal({
data, data,
@@ -15,8 +15,8 @@ function JobsDocumentGalleryExternal({
let documents = data.reduce((acc, value) => { let documents = data.reduce((acc, value) => {
if (value.type.startsWith("image")) { if (value.type.startsWith("image")) {
acc.push({ acc.push({
src: GenerateSrcUrl(value), //src: GenerateSrcUrl(value),
thumbnail: GenerateThumbUrl(value), src: GenerateThumbUrl(value),
thumbnailHeight: 225, thumbnailHeight: 225,
thumbnailWidth: 225, thumbnailWidth: 225,
isSelected: false, isSelected: false,

4
client/src/components/scoreboard-timetickets/scoreboard-timetickets.component.jsx
View File

@@ -223,10 +223,6 @@ export default function ScoreboardTimeTickets() {
ret2.push(r); ret2.push(r);
}); });
console.log(
"🚀 ~ file: scoreboard-timetickets.component.jsx:238 ~ calculatedData ~ ret:",
ret
);
// Add total efficiency of employees // Add total efficiency of employees
const totalActualAndProductive = Object.keys(ret.employees) const totalActualAndProductive = Object.keys(ret.employees)