From 1017a3dfe299f3fbaf55f5a31dd21232d24562c6 Mon Sep 17 00:00:00 2001
From: Surya Paolo <paolo.arena77@gmail.com>
Date: Wed, 28 Feb 2024 23:56:23 +0100
Subject: [PATCH] - zoom dialog immagine

---
 src/server/models/contribtype.js |  2 ++
 src/server/tools/general.js      | 29 ++++++++++++++---------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/server/models/contribtype.js b/src/server/models/contribtype.js
index 9446519..c0dd8dc 100755
--- a/src/server/models/contribtype.js
+++ b/src/server/models/contribtype.js
@@ -25,10 +25,12 @@ const ContribtypeSchema = new Schema({
 });
 
 ContribtypeSchema.statics.getFieldsForSearch = function () {
+
   return [{field: 'label', type: tools.FieldType.string}]
 };
 
 ContribtypeSchema.statics.executeQueryTable = function (idapp, params) {
+
   params.fieldsearch = this.getFieldsForSearch();
   return tools.executeQueryTable(this, idapp, params);
 };
diff --git a/src/server/tools/general.js b/src/server/tools/general.js
index c5e2a79..f9df4e3 100755
--- a/src/server/tools/general.js
+++ b/src/server/tools/general.js
@@ -1,17 +1,13 @@
 const os = require('os');
-
 const fs = require('fs');
-
 const path = require('path');
 
 require('../config/config');
-
 require('../models/subscribers');
 
 const printf = require('util').format;
 
 const CryptoJS = require('crypto-js');
-
 const Url = require('url-parse');
 
 const { ObjectID, ObjectId } = require('mongodb');
@@ -19,24 +15,13 @@ const { ObjectID, ObjectId } = require('mongodb');
 const shared_consts = require('./shared_nodejs');
 
 const mongoose = require('mongoose').set('debug', false);
-const Subscription = require('../models/subscribers');
-
-const { Contribtype } = require('../models/contribtype');
-const { Skill } = require('../models/skill');
-const { Sector } = require('../models/sector');
-const { Good } = require('../models/good');
-const { SectorGood } = require('../models/sectorgood');
 
 const server_constants = require('./server_constants');
 
-const download = require('image-downloader');
-
 // SETTINGS WebPush Configuration
 const webpush = require('web-push');
 
 const i18n = require('i18n');
-const { StatusSkill } = require('../models/statusSkill');
-
 
 const FILELOG = 'filelog.txt';
 const FILEEVENTS = 'logevents.txt';
@@ -731,6 +716,7 @@ module.exports = {
   },
 
   sendBackNotif: function (subscription, payload) {
+    const Subscription = require('../models/subscribers');
 
     // console.log('sendBackNotif:', subscription, payload);
 
@@ -764,6 +750,7 @@ module.exports = {
   },
 
   sendNotificationToUser: async function (userId, title, content, openUrl, openUrl2, tag, actions, id) {
+    const Subscription = require('../models/subscribers');
 
     content = this.convertHTMLtoText(content);
 
@@ -4066,6 +4053,8 @@ module.exports = {
   },
 
   downloadImage(url, filepath) {
+    const download = require('image-downloader');
+
     try {
       return download.image({
         url,
@@ -4436,6 +4425,8 @@ module.exports = {
   },
 
   async getInCambioDiByRec(myrec) {
+    const { Contribtype } = require('../models/contribtype');
+
     const contribtype = await Contribtype.findAllIdApp(idapp);
 
     try {
@@ -4456,6 +4447,8 @@ module.exports = {
   },
 
   async getStatusSkillByRec(myrec, onlyifNoDiPersona) {
+    const { StatusSkill } = require('../models/statusSkill');
+
     const statusskill = await StatusSkill.findAllIdApp(idapp);
 
     try {
@@ -4489,6 +4482,9 @@ module.exports = {
   },
 
   async getCategoriaSkillByRec(myrec) {
+    const { Skill } = require('../models/skill');
+    const { Sector } = require('../models/sector');
+
     const skillrec = await Skill.findAllIdApp(idapp);
     const sectorrec = await Sector.findAllIdApp(idapp);
 
@@ -4508,6 +4504,9 @@ module.exports = {
     }
   },
   async getCategoriaGoodByRec(myrec) {
+    const { SectorGood } = require('../models/sectorgood');
+    // const { Good } = require('../models/good');
+
     // const goodrec = await Good.findAllIdApp(idapp);
     const secgoodrec = await SectorGood.findAllIdApp(idapp);