diff --git a/.env.development b/.env.development index 7f58cb00..620035d3 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.3.16" +APP_VERSION="0.3.17" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.example.production b/.env.example.production index ed7e48ce..18d3e2d0 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,4 +1,4 @@ -APP_VERSION="0.3.16" +APP_VERSION="0.3.17" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/insiemesipuo.app/.env.development b/_ALL_SITES/insiemesipuo.app/.env.development index a00c628b..101825bb 100755 --- a/_ALL_SITES/insiemesipuo.app/.env.development +++ b/_ALL_SITES/insiemesipuo.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.3.16" +APP_VERSION="0.3.17" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/popolodelnuovomondo.app/.env.development b/_ALL_SITES/popolodelnuovomondo.app/.env.development index 564b0bd0..a9801197 100755 --- a/_ALL_SITES/popolodelnuovomondo.app/.env.development +++ b/_ALL_SITES/popolodelnuovomondo.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.3.16" +APP_VERSION="0.3.17" SERVICE_WORKER_FILE="service-worker.js" APP_ID="12" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/riso.app/.env.development b/_ALL_SITES/riso.app/.env.development index af745464..6325b623 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.3.16" +APP_VERSION="0.3.17" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/riso.app/.env.test b/_ALL_SITES/riso.app/.env.test index d0f5f635..bfa147ba 100755 --- a/_ALL_SITES/riso.app/.env.test +++ b/_ALL_SITES/riso.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="0.3.16" +APP_VERSION="0.3.17" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/package.json b/package.json index 25c42d20..b0e41623 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "riso", - "version": "0.3.16", + "version": "0.3.17", "description": "Riso", "productName": "Riso", "author": "Paolo Arena", diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index 77ae1640..64a5964f 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -256,19 +256,27 @@ export const shared_consts = { }, { value: 4, - label: 'in camper', + label: 'Camper', }, { value: 5, - label: 'in tenda', + label: 'Roulotte', }, { value: 6, - label: 'in giardino', + label: 'Tenda', }, { value: 7, - label: 'all\'aperto', + label: 'Casetta sull\'Albero', + }, + { + value: 8, + label: 'Giardino', + }, + { + value: 9, + label: 'Aria aperta', }, ], @@ -277,7 +285,7 @@ export const shared_consts = { People: [ { value: 0, - label: 'Nessuna', + label: 'Nessuno', }, { value: 1, @@ -327,18 +335,14 @@ export const shared_consts = { value: 12, label: '12', }, - { - value: 13, - label: '13', - }, - { - value: 14, - label: '14', - }, { value: 15, label: '15', }, + { + value: 20, + label: '20', + }, ], Preferences: [ @@ -374,6 +378,14 @@ export const shared_consts = { value: 8, label: 'Sono permessi soggiorni a lungo termine', }, + { + value: 9, + label: 'Cucina Vegetariana', + }, + { + value: 10, + label: 'Cucina Vegana', + }, ], Regions: [ diff --git a/src/components/CDashboard/CDashboard.vue b/src/components/CDashboard/CDashboard.vue index 4eb16120..afd92f00 100755 --- a/src/components/CDashboard/CDashboard.vue +++ b/src/components/CDashboard/CDashboard.vue @@ -10,8 +10,7 @@ calcstat.numUsersReg }} - Persone - Iscritte + Persone Iscritte diff --git a/src/components/CFinder/CFinder.ts b/src/components/CFinder/CFinder.ts index ba9d7fa6..db9eb64c 100755 --- a/src/components/CFinder/CFinder.ts +++ b/src/components/CFinder/CFinder.ts @@ -555,7 +555,7 @@ export default defineComponent({ icon: 'flag', }, { - label: 'Max. Ospiti', + label: 'N° max Ospiti', table: toolsext.TABPEOPLE, key: 'numMaxPeopleHosp', type: costanti.FieldType.select, diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js index 04e4a575..1cc9ab4b 100755 --- a/src/statics/lang/it.js +++ b/src/statics/lang/it.js @@ -958,7 +958,7 @@ const msg_it = { }, hosps: { typeHosp: 'Tipologia', - numMaxPeopleHosp: 'Numero Massimo di Ospiti', + numMaxPeopleHosp: 'N° max Ospiti', accomodation: { title: 'Tipo di Ospitalità', location: 'Spazio', diff --git a/src/store/Modules/costanti.ts b/src/store/Modules/costanti.ts index 18bb9222..e33b543a 100755 --- a/src/store/Modules/costanti.ts +++ b/src/store/Modules/costanti.ts @@ -57,15 +57,16 @@ export const costanti = { }, { visible: true, - title: 'Scambio Ospitalità', - strsingolo: 'Scambio Ospitalità', + title: 'Ospitalità', + strsingolo: 'Ospitalità', to: '/hosps', icon: 'fas fa-bed', - color: 'lime-6', + color: 'lime-8', textcolor: '', hint: '', disable: false, small: false, + visuonstat: true, }, { visible: false, diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts index a49cc398..efade2ff 100644 --- a/src/store/Modules/tools.ts +++ b/src/store/Modules/tools.ts @@ -4360,6 +4360,7 @@ export const tools = { 'lime-3': '#e6ee9c', 'lime-4': '#dce775', 'lime-6': '#cddc39', + 'lime-8': '#afb42b', 'limegreen': '#32cd32', 'linen': '#faf0e6', 'magenta': '#ff00ff',