From 99338bb6f80f973e2a38bbc1fd92b009df3fb740 Mon Sep 17 00:00:00 2001 From: Pau Navarro Date: Tue, 17 Jan 2023 10:11:41 +0100 Subject: [PATCH] isPhotoRequired implemented --- back/models/image.js | 7 +++++++ modules/item/back/methods/item/new.js | 5 ++++- modules/item/back/models/item.json | 6 ++++++ modules/item/front/basic-data/index.html | 6 ++++++ modules/item/front/basic-data/locale/es.yml | 4 +++- modules/item/front/summary/index.html | 10 ++++++++++ 6 files changed, 36 insertions(+), 2 deletions(-) diff --git a/back/models/image.js b/back/models/image.js index d736e924f..f646543fc 100644 --- a/back/models/image.js +++ b/back/models/image.js @@ -145,6 +145,13 @@ module.exports = Self => { fileName, myOptions ); + if (item.isPhotoRequested) { + await item.updateAttribute( + 'isPhotoRequested', + false, + myOptions + ); + } } if (fs.existsSync(srcFilePath)) diff --git a/modules/item/back/methods/item/new.js b/modules/item/back/methods/item/new.js index fae37836f..a20437887 100644 --- a/modules/item/back/methods/item/new.js +++ b/modules/item/back/methods/item/new.js @@ -24,6 +24,8 @@ module.exports = Self => { const myOptions = {}; let tx; + params.isPhotoRequested = true; + if (typeof options == 'object') Object.assign(myOptions, options); @@ -37,7 +39,8 @@ module.exports = Self => { 'typeFk', 'intrastatFk', 'originFk', - 'relevancy' + 'relevancy', + 'isPhotoRequested', ]; for (const key in params) { diff --git a/modules/item/back/models/item.json b/modules/item/back/models/item.json index 2f58c30a9..10300f7a1 100644 --- a/modules/item/back/models/item.json +++ b/modules/item/back/models/item.json @@ -146,6 +146,12 @@ }, "isLaid": { "type": "boolean" + }, + "isPhotoRequested": { + "type": "boolean", + "mysql":{ + "columnName": "doPhoto" + } } }, "relations": { diff --git a/modules/item/front/basic-data/index.html b/modules/item/front/basic-data/index.html index fd21ab240..974aa37d8 100644 --- a/modules/item/front/basic-data/index.html +++ b/modules/item/front/basic-data/index.html @@ -182,6 +182,12 @@ ng-model="$ctrl.item.isFragile" info="Is shown at website, app that this item cannot travel (wreath, palms, ...)"> + + diff --git a/modules/item/front/basic-data/locale/es.yml b/modules/item/front/basic-data/locale/es.yml index d59752ebb..747dfe792 100644 --- a/modules/item/front/basic-data/locale/es.yml +++ b/modules/item/front/basic-data/locale/es.yml @@ -11,4 +11,6 @@ Identifier: Identificador Fragile: Frágil Is shown at website, app that this item cannot travel (wreath, palms, ...): Se muestra en la web, app que este artículo no puede viajar (coronas, palmas, ...) Multiplier: Multiplicador -Generic: Genérico \ No newline at end of file +Generic: Genérico +This item does need a photo: Este artículo necesita una foto +Do photo: Hacer foto \ No newline at end of file diff --git a/modules/item/front/summary/index.html b/modules/item/front/summary/index.html index a4d40c829..801a82ee0 100644 --- a/modules/item/front/summary/index.html +++ b/modules/item/front/summary/index.html @@ -65,6 +65,16 @@ {{$ctrl.summary.item.itemType.worker.user.name}} + + + +