From 3f808189e379bf85cdb82c583645c48e99bb29f7 Mon Sep 17 00:00:00 2001
From: Surya Paolo <paolo.arena77@gmail.com>
Date: Sat, 4 Mar 2023 10:20:49 +0100
Subject: [PATCH] ver 0.5.73: - corretto invia monete da Conto Collettivo a
 Utente - Aggiunto Provincia (tutorial).. in corso...

---
 .env.development                              |   2 +-
 .env.example.production                       |   2 +-
 .env.test.risosrv                             |   2 +-
 _ALL_SITES/riso.app/.env.development          |   2 +-
 _ALL_SITES/riso.app/.env.production           |   2 +-
 .../terradellavisione.app/.env.development    |   2 +-
 src/common/shared_vuejs.ts                    |   5 +
 src/components/CMyElem/CMyElem.ts             |   2 +
 src/components/CMyElem/CMyElem.vue            |   4 +
 .../CMyProfileTutorial.scss                   |   4 +
 .../CMyProfileTutorial/CMyProfileTutorial.ts  | 120 +++++++++++++++++
 .../CMyProfileTutorial/CMyProfileTutorial.vue | 104 +++++++++++++++
 src/components/CMyProfileTutorial/index.ts    |   1 +
 src/components/CMySelect/CMySelect.vue        |   6 +-
 .../CMySelectCity/CMySelectCity.scss          |   9 ++
 src/components/CMySelectCity/CMySelectCity.ts | 124 ++++++++++++++++++
 .../CMySelectCity/CMySelectCity.vue           |  32 +++++
 src/components/CMySelectCity/index.ts         |   1 +
 src/components/CMyUser/CMyUser.ts             |  19 +--
 src/components/CSendCoins/CSendCoins.ts       |   2 +-
 src/components/CSendCoins/CSendCoins.vue      |  45 ++++---
 src/components/CSignUp/CSignUp.vue            |   4 +-
 src/components/MyFooter/MyFooter.vue          |   2 +-
 src/css/app.scss                              |   5 +
 src/model/UserStore.ts                        |   2 +
 src/statics/lang/it.js                        |  36 ++---
 src/store/Modules/costanti.ts                 |   2 +-
 src/views/user/mycircuit/mycircuit.vue        |  16 +--
 28 files changed, 483 insertions(+), 74 deletions(-)
 create mode 100755 src/components/CMyProfileTutorial/CMyProfileTutorial.scss
 create mode 100755 src/components/CMyProfileTutorial/CMyProfileTutorial.ts
 create mode 100755 src/components/CMyProfileTutorial/CMyProfileTutorial.vue
 create mode 100755 src/components/CMyProfileTutorial/index.ts
 create mode 100755 src/components/CMySelectCity/CMySelectCity.scss
 create mode 100755 src/components/CMySelectCity/CMySelectCity.ts
 create mode 100755 src/components/CMySelectCity/CMySelectCity.vue
 create mode 100755 src/components/CMySelectCity/index.ts

diff --git a/.env.development b/.env.development
index 7828fb02..209ff209 100755
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,4 @@
-APP_VERSION="0.5.71"
+APP_VERSION="0.5.73"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL="newfreeplanet"
diff --git a/.env.example.production b/.env.example.production
index 82168c27..5a7c847b 100755
--- a/.env.example.production
+++ b/.env.example.production
@@ -1,4 +1,4 @@
-APP_VERSION="0.5.71"
+APP_VERSION="0.5.73"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet
diff --git a/.env.test.risosrv b/.env.test.risosrv
index 95d9de54..77d9b0b0 100755
--- a/.env.test.risosrv
+++ b/.env.test.risosrv
@@ -1,4 +1,4 @@
-APP_VERSION="0.5.71"
+APP_VERSION="0.5.73"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet
diff --git a/_ALL_SITES/riso.app/.env.development b/_ALL_SITES/riso.app/.env.development
index 7828fb02..209ff209 100755
--- a/_ALL_SITES/riso.app/.env.development
+++ b/_ALL_SITES/riso.app/.env.development
@@ -1,4 +1,4 @@
-APP_VERSION="0.5.71"
+APP_VERSION="0.5.73"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL="newfreeplanet"
diff --git a/_ALL_SITES/riso.app/.env.production b/_ALL_SITES/riso.app/.env.production
index 42135f7f..be8c9880 100644
--- a/_ALL_SITES/riso.app/.env.production
+++ b/_ALL_SITES/riso.app/.env.production
@@ -1,4 +1,4 @@
-APP_VERSION="0.5.71"
+APP_VERSION="0.5.73"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet
diff --git a/_ALL_SITES/terradellavisione.app/.env.development b/_ALL_SITES/terradellavisione.app/.env.development
index f53dfe18..10de50ba 100755
--- a/_ALL_SITES/terradellavisione.app/.env.development
+++ b/_ALL_SITES/terradellavisione.app/.env.development
@@ -1,4 +1,4 @@
-APP_VERSION="0.5.71"
+APP_VERSION="0.5.73"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="14"
 DIRECTORY_LOCAL="newfreeplanet"
diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts
index 2831907f..4e4cdf2c 100755
--- a/src/common/shared_vuejs.ts
+++ b/src/common/shared_vuejs.ts
@@ -55,6 +55,7 @@ export const shared_consts = {
     REGISTRATION: 258,
     BTN_LOGIN: 260,
     FOOTER: 270,
+    PROFILETUTORIAL: 280,
   },
 
   QUERYTYPE_MYGROUP: 1,
@@ -1307,6 +1308,10 @@ export const shared_consts = {
       value: 140,
       label: 'Dashboard',
     },
+    {
+      value: 280,
+      label: 'Tutorial',
+    },
   ],
 
   TypesElemAdminTools: [
diff --git a/src/components/CMyElem/CMyElem.ts b/src/components/CMyElem/CMyElem.ts
index 6da3dbe6..b7d40a72 100755
--- a/src/components/CMyElem/CMyElem.ts
+++ b/src/components/CMyElem/CMyElem.ts
@@ -22,6 +22,7 @@ import { CMyEditor } from '@src/components/CMyEditor'
 import { CMyFieldRec } from '@src/components/CMyFieldRec'
 import { CSelectColor } from '@src/components/CSelectColor'
 import { CMainView } from '@src/components/CMainView'
+import { CMyProfileTutorial } from '@src/components/CMyProfileTutorial'
 import { CDashboard } from '@src/components/CDashboard'
 import { CCheckAppRunning } from '@src/components/CCheckAppRunning'
 import { CStatusReg } from '@src/components/CStatusReg'
@@ -48,6 +49,7 @@ export default defineComponent({
     CSelectColor, CSelectFontSize, CImgPoster,
     CCheckIfIsLogged, CStatusReg, CDashboard, CMainView, CNotifAtTop,
     CPresentazione, CMyActivities,
+    CMyProfileTutorial,
     CTitleBanner, CShareSocial, CCheckAppRunning, CRegistration,
   },
   emits: ['selElemClick'],
diff --git a/src/components/CMyElem/CMyElem.vue b/src/components/CMyElem/CMyElem.vue
index 91f32685..a3ee77e0 100755
--- a/src/components/CMyElem/CMyElem.vue
+++ b/src/components/CMyElem/CMyElem.vue
@@ -435,6 +435,10 @@
         <div v-if="editOn" class="elemEdit">CMainView</div>
         <CMainView></CMainView>
       </div>
+      <div v-else-if="myel.type === shared_consts.ELEMTYPE.PROFILETUTORIAL">
+        <div v-if="editOn" class="elemEdit">CMyProFileTutorual</div>
+        <CMyProfileTutorial />
+      </div>
       <div v-else-if="myel.type === shared_consts.ELEMTYPE.CHECKAPPRUNNING">
         <div v-if="editOn" class="elemEdit">CheckAppRunning</div>
         <CCheckAppRunning />
diff --git a/src/components/CMyProfileTutorial/CMyProfileTutorial.scss b/src/components/CMyProfileTutorial/CMyProfileTutorial.scss
new file mode 100755
index 00000000..b892863a
--- /dev/null
+++ b/src/components/CMyProfileTutorial/CMyProfileTutorial.scss
@@ -0,0 +1,4 @@
+.myflex{
+  display: flex;
+  flex: 1;
+}
diff --git a/src/components/CMyProfileTutorial/CMyProfileTutorial.ts b/src/components/CMyProfileTutorial/CMyProfileTutorial.ts
new file mode 100755
index 00000000..58c9bf4c
--- /dev/null
+++ b/src/components/CMyProfileTutorial/CMyProfileTutorial.ts
@@ -0,0 +1,120 @@
+import { defineComponent, onMounted, PropType, ref, watch, computed } from 'vue'
+import { useUserStore } from '@store/UserStore'
+import { ICircuit, IImgGallery, IUserFields, IUserProfile } from 'model'
+import { costanti } from '@costanti'
+import { shared_consts } from '@/common/shared_vuejs'
+import { tools } from '@store/Modules/tools'
+import { useQuasar } from 'quasar'
+import { CSendCoins } from '@/components/CSendCoins'
+import { CMyFieldRec } from '@/components/CMyFieldRec'
+import { CSaldo } from '@/components/CSaldo'
+import { CMySelectCity } from '@/components/CMySelectCity'
+import { CMySelect } from '@/components/CMySelect'
+import { CUserInfoAccount } from '@/components/CUserInfoAccount'
+import { useI18n } from '@/boot/i18n'
+import { useRoute, useRouter } from 'vue-router'
+import { useCircuitStore } from '@store/CircuitStore'
+
+export default defineComponent({
+  name: 'CMyProfileTutorial',
+  components: { CSendCoins, CSaldo, CUserInfoAccount,
+    CMySelectCity, CMyFieldRec, CMySelect },
+  emits: ['setCmd'],
+  props: {
+    mycontact: {
+      type: Object as PropType<IUserFields | null>,
+      required: false,
+      default: null,
+    },
+    myusername: {
+      type: String,
+      required: false,
+      default: null,
+    },
+  },
+
+  setup(props, { emit }) {
+
+    const userStore = useUserStore()
+    const circuitStore = useCircuitStore()
+    const $q = useQuasar()
+    const { t } = useI18n()
+    const $router = useRouter()
+    const $route = useRoute()
+
+    const showAccountInfo = ref(false)
+    const slide = ref('1')
+
+    const username = ref('')
+    const showsendCoinTo = ref(false)
+
+    const contact = ref(<IUserFields | null>null)
+    const circuit = ref(<ICircuit | null | undefined>null)
+
+    watch(() => props.mycontact, (newval, oldval) => {
+      console.log('watch: mycontact')
+      mounted()
+    })
+
+    function mounted() {
+      if (!props.mycontact) {
+        if (props.myusername) {
+          username.value = props.myusername
+          //++Todo: carica contact
+          contact.value = null
+        } else {
+          contact.value = userStore.my
+        }
+      } else {
+        if (props.mycontact) {
+          contact.value = props.mycontact
+          username.value = props.mycontact.username
+        }
+      }
+
+      // circuit.value = circuitStore.getCircuitByName(props.circuitname)
+    }
+
+    function getImgUser(profile: IUserFields) {
+      return userStore.getImgByProfile(profile)
+    }
+
+    function naviga(path: string) {
+      $router.push(path)
+    }
+
+    function setCmd($q: any, cmd: number, myusername: string, value: any, dest: string) {
+      emit('setCmd', $q, cmd, myusername, value, dest)
+    }
+
+    const checkifDisabled = computed(() => {
+      let ret = true
+      if (slide.value === '1') {
+        // Invitante + Email
+      } else if (slide.value === '2') {
+        // Username
+      } else if (slide.value === '3') {
+        // Password
+      }
+
+      return ret
+    })
+
+    onMounted(mounted)
+
+    return {
+      contact,
+      costanti,
+      checkifDisabled,
+      getImgUser,
+      naviga,
+      setCmd,
+      shared_consts,
+      tools,
+      showsendCoinTo,
+      circuit,
+      showAccountInfo,
+      slide,
+    }
+  },
+})
diff --git a/src/components/CMyProfileTutorial/CMyProfileTutorial.vue b/src/components/CMyProfileTutorial/CMyProfileTutorial.vue
new file mode 100755
index 00000000..0997da52
--- /dev/null
+++ b/src/components/CMyProfileTutorial/CMyProfileTutorial.vue
@@ -0,0 +1,104 @@
+<template>
+  <div v-if="contact">
+    <div class="q-gutter-md">
+      <q-carousel
+        v-model="slide"
+        transition-prev="slide-right"
+        transition-next="slide-left"
+        swipeable
+        animated
+        control-color="white"
+        navigation
+        padding
+        arrows
+        height="200px"
+        class="text-white shadow-1 rounded-borders"
+      >
+        <q-carousel-slide name="1" class="column no-wrap flex-center">
+          <q-icon name="house" size="56px" />
+          <div class="q-mt-sm text-center">
+            <CMySelectCity
+              :label="$t('reg.resid_province')"
+              table="users"
+              jointable="provinces"
+              v-model="contact.profile.resid_province"
+              myclass="selectorwide"
+              :db_type="costanti.FieldType.string"
+              db_field="profile"
+              db_subfield="resid_province"
+              :db_id="contact._id"
+              :db_rec="contact"
+            >
+            </CMySelectCity>
+          </div>
+        </q-carousel-slide>
+        <q-carousel-slide name="2" class="column no-wrap flex-center">
+          <q-icon name="live_tv" size="56px" />
+          <div class="q-mt-md text-center"></div>
+        </q-carousel-slide>
+        <q-carousel-slide name="3" class="column no-wrap flex-center">
+          <q-icon name="layers" size="56px" />
+          <div class="q-mt-md text-center"></div>
+        </q-carousel-slide>
+        <q-carousel-slide name="4" class="column no-wrap flex-center">
+          <q-icon name="terrain" size="56px" />
+          <div class="q-mt-md text-center"></div>
+        </q-carousel-slide>
+        <template v-slot:control>
+          <q-carousel-control
+            position="bottom-right"
+            :offset="[18, 18]"
+            class="q-gutter-xs"
+          >
+            <q-btn
+              v-if="slide !== '1'"
+              push
+              text-color="black"
+              icon="arrow_left"
+              :label="$t('dialog.indietro')"
+              @click="$refs.carousel.previous()"
+            />
+            <q-btn
+              v-if="slide !== '4'"
+              push
+              color="primary"
+              icon="arrow_right"
+              :label="$t('dialog.avanti')"
+              :disabled="checkifDisabled"
+              @click="!checkifDisabled ? $refs.carousel.next() : null"
+            />
+          </q-carousel-control>
+        </template>
+      </q-carousel>
+      <div class="row justify-center">
+        <q-btn-toggle
+          glossy
+          v-model="slide"
+          :options="[
+            { label: '1', value: '1' },
+            { label: 2, value: '2' },
+            { label: 3, value: '3' },
+            { label: 4, value: '4' },
+          ]"
+        />
+      </div>
+    </div>
+  </div>
+  <q-dialog v-model="showAccountInfo" full-height full-width>
+    <q-card v-if="true">
+      <q-toolbar class="bg-primary text-white">
+        <q-toolbar-title class="text-h7">
+          {{ tools.getNomeUtenteByRecUser(contact) }}
+        </q-toolbar-title>
+        <q-btn flat round color="white" icon="close" v-close-popup></q-btn>
+      </q-toolbar>
+    </q-card>
+  </q-dialog>
+</template>
+
+<script lang="ts" src="./CMyProfileTutorial.ts">
+</script>
+
+<style lang="scss" scoped>
+@import './CMyProfileTutorial.scss';
+</style>
diff --git a/src/components/CMyProfileTutorial/index.ts b/src/components/CMyProfileTutorial/index.ts
new file mode 100755
index 00000000..69800ba8
--- /dev/null
+++ b/src/components/CMyProfileTutorial/index.ts
@@ -0,0 +1 @@
+export { default as CMyProfileTutorial } from './CMyProfileTutorial.vue'
diff --git a/src/components/CMySelect/CMySelect.vue b/src/components/CMySelect/CMySelect.vue
index 81988a06..406307ff 100755
--- a/src/components/CMySelect/CMySelect.vue
+++ b/src/components/CMySelect/CMySelect.vue
@@ -25,8 +25,8 @@
         :options="valori"
         :option-value="optval"
         options-selected-class="text-deep-blue"
-        class="combowidth"
-        style="min-width: 250px"
+        :class="myclass ? myclass : 'combowidth'"
+        style="min-width: 250px !important"
       >
         <template v-if="getIcon() && !sola_lettura" v-slot:prepend>
           <q-icon :name="getIcon()" />
@@ -196,7 +196,7 @@
         options-selected-class="text-deep-blue"
         map-options
         v-bind="$attrs"
-        class="combowidth">
+        :class="myclass ? myclass : 'combowidth'">
         <template v-if="getIcon()" v-slot:prepend>
           <q-icon :name="getIcon()" />
         </template>
diff --git a/src/components/CMySelectCity/CMySelectCity.scss b/src/components/CMySelectCity/CMySelectCity.scss
new file mode 100755
index 00000000..d51b8641
--- /dev/null
+++ b/src/components/CMySelectCity/CMySelectCity.scss
@@ -0,0 +1,9 @@
+.myflex{
+  display: flex;
+  flex: 1;
+}
+
+.hint{
+  color: gray;
+  font-style: italic;
+}
diff --git a/src/components/CMySelectCity/CMySelectCity.ts b/src/components/CMySelectCity/CMySelectCity.ts
new file mode 100755
index 00000000..687c726c
--- /dev/null
+++ b/src/components/CMySelectCity/CMySelectCity.ts
@@ -0,0 +1,124 @@
+import { computed, defineComponent, onMounted, PropType, ref, toRef, watch } from 'vue'
+import { useI18n } from '@src/boot/i18n'
+import { useUserStore } from '@store/UserStore'
+import { useGlobalStore } from '@store/globalStore'
+import { useQuasar } from 'quasar'
+import { CMySelect } from '@/components/CMySelect'
+
+import { costanti } from '@costanti'
+import { fieldsTable } from '@store/Modules/fieldsTable'
+import { shared_consts } from '@/common/shared_vuejs'
+import { tools } from '@store/Modules/tools'
+import MixinBase from '@/mixins/mixin-base'
+import { ISpecialField } from '@src/model'
+
+export default defineComponent({
+  name: 'CMySelectCity',
+  emits: ['update:modelValue'],
+  props: {
+    modelValue: [String, Number, Object],
+    label: {
+      type: String,
+      required: false,
+      default: undefined,
+    },
+    table: {
+      type: String,
+      required: false,
+      default: ''
+    },
+    myclass: {
+      type: String,
+      required: false,
+      default: ''
+    },
+    jointable: {
+      type: String,
+      required: false,
+      default: ''
+    },
+    db_field: {
+      type: String,
+      required: false,
+      default: '',
+    },
+    db_type: {
+      type: Number,
+      required: false,
+      default: 0,
+    },
+    db_subfield: {
+      type: String,
+      required: false,
+      default: '',
+    },
+    db_subsubfield: {
+      type: String,
+      required: false,
+      default: '',
+    },
+    db_specialField: {
+      type: Object as PropType<ISpecialField>,
+      required: false,
+      default: null,
+    },
+    db_id: {
+      type: [String, Number],
+      required: false,
+      default: '',
+    },
+    db_rec: {
+      type: Object,
+      required: false,
+      default: null,
+    },
+  },
+  components: { CMySelect },
+  setup(props, { emit }) {
+    const $q = useQuasar()
+    const { t } = useI18n()
+    const userStore = useUserStore()
+    const globalStore = useGlobalStore()
+
+    const optFiltered = ref(<any>[])
+    const valori = ref(<any>[])
+
+    const { setValDb, getValDb } = MixinBase()
+
+    const myvalue = ref(<string | number | object | undefined>'')
+
+    watch(() => myvalue.value, (value: any, oldval: any) => {
+      update()
+    },
+    )
+
+    function mounted() {
+      myvalue.value = props.modelValue
+      update()
+    }
+
+    function update() {
+      //
+      emit('update:modelValue', myvalue.value)
+    }
+
+    function changevalRec(newval: any) {
+      if (props.db_type > 0)
+        setValDb($q, props.db_field, newval, props.db_type, false, props.table, props.db_subfield, props.db_id, 0, props.db_subsubfield, props.db_specialField)
+
+    }
+
+    onMounted(mounted)
+
+    return {
+      tools,
+      costanti,
+      globalStore,
+      shared_consts,
+      fieldsTable,
+      myvalue,
+      changevalRec,
+    }
+  }
+})
+
diff --git a/src/components/CMySelectCity/CMySelectCity.vue b/src/components/CMySelectCity/CMySelectCity.vue
new file mode 100755
index 00000000..efb9e7f8
--- /dev/null
+++ b/src/components/CMySelectCity/CMySelectCity.vue
@@ -0,0 +1,32 @@
+<template>
+  <div>
+    <CMySelect
+      :type_out="costanti.FieldType.object"
+      :label="label"
+      v-model="myvalue"
+      :pickup="false"
+      :addnone="true"
+      :tablesel="table"
+      :myclass="myclass"
+      :optval="fieldsTable.getKeyByTable(jointable)"
+      :optlab="fieldsTable.getLabelByTable(jointable)"
+      :options="
+        globalStore.getTableJoinByName(
+          jointable,
+          false,
+          false,
+          ''
+        )"
+      :useinput="false"
+      @update:value="changevalRec"
+    >
+    </CMySelect>
+  </div>
+</template>
+
+<script lang="ts" src="./CMySelectCity.ts">
+</script>
+
+<style lang="scss" scoped>
+@import './CMySelectCity.scss';
+</style>
diff --git a/src/components/CMySelectCity/index.ts b/src/components/CMySelectCity/index.ts
new file mode 100755
index 00000000..443e5c88
--- /dev/null
+++ b/src/components/CMySelectCity/index.ts
@@ -0,0 +1 @@
+export {default as CMySelectCity} from './CMySelectCity.vue'
diff --git a/src/components/CMyUser/CMyUser.ts b/src/components/CMyUser/CMyUser.ts
index 6890602e..aee3c86a 100755
--- a/src/components/CMyUser/CMyUser.ts
+++ b/src/components/CMyUser/CMyUser.ts
@@ -72,10 +72,11 @@ export default defineComponent({
     const $router = useRouter()
     const $route = useRoute()
 
+    const showsendCoinTo = ref(false)
+
     const showAccountInfo = ref(false)
 
     const username = ref('')
-    const showsendCoinTo = ref(false)
 
     const contact = ref(<IUserFields | null>null)
     const circuit = ref(<ICircuit | null | undefined>null)
@@ -86,17 +87,9 @@ export default defineComponent({
     })
 
     function mounted() {
-      if (!props.mycontact) {
-        if (props.myusername) {
-          username.value = props.myusername
-          //++Todo: carica contact
-          contact.value = null
-        }
-      } else {
-        if (props.mycontact) {
-          contact.value = props.mycontact
-          username.value = props.mycontact.username
-        }
+      if (props.mycontact) {
+        contact.value = props.mycontact
+        username.value = props.mycontact.username
       }
 
       circuit.value = circuitStore.getCircuitByName(props.circuitname)
@@ -129,9 +122,9 @@ export default defineComponent({
       shared_consts,
       userStore,
       tools,
-      showsendCoinTo,
       circuit,
       showAccountInfo,
+      showsendCoinTo,
     }
   },
 })
diff --git a/src/components/CSendCoins/CSendCoins.ts b/src/components/CSendCoins/CSendCoins.ts
index fece1869..cacb3226 100755
--- a/src/components/CSendCoins/CSendCoins.ts
+++ b/src/components/CSendCoins/CSendCoins.ts
@@ -106,7 +106,7 @@ export default defineComponent({
 
       if (tipoConto.value === costanti.AccountType.COLLECTIVE_ACCOUNT) {
         if (arrGroupsList.value.length >= 1)
-          from_groupname.value = arrGroupsList.value[0]
+          from_groupname.value = arrGroupsList.value[0].value
       }
 
       aggiorna()
diff --git a/src/components/CSendCoins/CSendCoins.vue b/src/components/CSendCoins/CSendCoins.vue
index 112545b6..6d126a37 100755
--- a/src/components/CSendCoins/CSendCoins.vue
+++ b/src/components/CSendCoins/CSendCoins.vue
@@ -24,9 +24,7 @@
             label="Circuito"
           >
           </q-select>
-          <div v-else>
-            Circuito: {{circuitname}}
-          </div>
+          <div v-else>Circuito: {{ circuitname }}</div>
 
           <q-banner
             rounded
@@ -86,7 +84,7 @@
             </div>
 
             <CSaldo
-              v-if="circuitloaded"
+              v-if="circuitloaded && circuitloaded.symbol"
               :symbol="circuitloaded.symbol"
               :color="circuitloaded.color"
               :saldo="accountloaded ? accountloaded.saldo : 0"
@@ -224,29 +222,34 @@
         </q-card-section>
         <q-card-actions align="center">
           <q-btn
-            v-if="circuitloaded && (qtyRef
-                ? !(qtyRef.hasError ||
-                  !circuitloaded.transactionsEnabled ||
-                  (tipoConto === costanti.AccountType.USER &&
-                    to_user &&
-                    from_username === to_user.username) ||
-                  (tipoConto === costanti.AccountType.COLLECTIVE_ACCOUNT &&
-                    !from_groupname) ||
-                  (tipoConto === costanti.AccountType.COLLECTIVE_ACCOUT &&
-                    to_group &&
-                    from_groupname &&
-                    to_group.groupname === from_groupname) ||
-                  (tipoConto === costanti.AccountType.COMMUNITY_ACCOUNT &&
-                    !from_contocom))
-                : true)"
+            v-if="
+              circuitloaded &&
+              (qtyRef
+                ? !(
+                    qtyRef.hasError ||
+                    !circuitloaded.transactionsEnabled ||
+                    (tipoConto === costanti.AccountType.USER &&
+                      to_user &&
+                      from_username === to_user.username) ||
+                    (tipoConto === costanti.AccountType.COLLECTIVE_ACCOUNT &&
+                      !from_groupname) ||
+                    (tipoConto === costanti.AccountType.COLLECTIVE_ACCOUT &&
+                      to_group &&
+                      from_groupname &&
+                      to_group.groupname === from_groupname) ||
+                    (tipoConto === costanti.AccountType.COMMUNITY_ACCOUNT &&
+                      !from_contocom)
+                  )
+                : true)
+            "
             :label="
               $t('circuit.sendcoinsto', {
                 qty,
-                coin: circuitsel,
+                coin: circuitloaded.symbol,
                 dest: to_group
                   ? to_group.groupname
                   : to_user
-                  ? to_user.username
+                  ? tools.getNomeUtenteByRecUser(to_user)
                   : to_contocom,
               })
             "
diff --git a/src/components/CSignUp/CSignUp.vue b/src/components/CSignUp/CSignUp.vue
index e81c7e34..ab44ddf7 100755
--- a/src/components/CSignUp/CSignUp.vue
+++ b/src/components/CSignUp/CSignUp.vue
@@ -323,7 +323,7 @@
                     push
                     text-color="black"
                     icon="arrow_left"
-                    label="Indietro"
+                    :label="$t('dialog.indietro')"
                     @click="$refs.carousel.previous()"
                   />
                   <q-btn
@@ -331,7 +331,7 @@
                     push
                     color="primary"
                     icon="arrow_right"
-                    label="Avanti"
+                    :label="$t('dialog.avanti')"
                     :disabled="checkifDisabled"
                     @click="!checkifDisabled ? $refs.carousel.next() : null"
                   />
diff --git a/src/components/MyFooter/MyFooter.vue b/src/components/MyFooter/MyFooter.vue
index 21ca2e32..900edb33 100755
--- a/src/components/MyFooter/MyFooter.vue
+++ b/src/components/MyFooter/MyFooter.vue
@@ -36,7 +36,7 @@
             class="mylabfooter"
             :label="$t('tabdown.circuits')"
             to="/circuits"
-            icon="fas fa-coins"
+            icon="img: images/1ris_rosso_100.png"
           />
           <q-route-tab
             v-if="site.confpages.showViewUsers"
diff --git a/src/css/app.scss b/src/css/app.scss
index acb10a7a..60f47e75 100755
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -1576,3 +1576,8 @@ h3 {
 .small_side {
   padding-left: 4px !important;
 }
+
+.selectorwide {
+  min-width: 250px;
+  font-size: 1rem;
+}
diff --git a/src/model/UserStore.ts b/src/model/UserStore.ts
index ca238100..1073fa88 100755
--- a/src/model/UserStore.ts
+++ b/src/model/UserStore.ts
@@ -82,6 +82,8 @@ export interface IUserProfile {
   born_city_id?: number
   born_city_str?: string
   born_province?: string
+  resid_prov_id?: number
+  resid_province?: string
   born_country?: string
   my_dream?: string
   saw_and_accepted?: boolean
diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js
index 007c7103..377ef642 100755
--- a/src/statics/lang/it.js
+++ b/src/statics/lang/it.js
@@ -71,7 +71,7 @@ const msg_it = {
         navi: 'Navi',
         listadoni_navi: 'Lista Doni Navi',
         newsletter: 'Newsletter',
-        monete: 'Monete',
+        monete: 'RIS',
         pages: 'Pagine',
         Home: 'Pagina Home',
         elems: 'Elementi Pagine',
@@ -222,8 +222,7 @@ const msg_it = {
       refusedgroup: 'Rifiutato a {username} la richiesta di entrare nel Gruppo',
       youarerefusedgroup: 'Ti è stato rifiutata la richiesta di entrare in questo Gruppo (per info chiedi all\'amministratore del gruppo)',
       youarerefusedcircuit: 'Ti è stato rifiutata la richiesta di entrare in questo Circuito (per info chiedi all\'amministratore del gruppo)',
-      insertgoodorservices_to_start_circuit: 'Per poter inviare monete è necessario aggiungere almeno un Bene o Servizio, con la voglia di proporsi ed accettare i RIS come scambio.',
-      insertgoodorservices_to_enter_circuit: 'Per poter entrare nel Circuito è necessario aggiungere almeno un Bene, Servizio o offrire Ospitalità',
+      insertgoodorservices_to_enter_circuit: 'Per poter inviare RIS è necessario aggiungere almeno un Bene, Servizio o offrire Ospitalità',
       deletedgroup: 'Gruppo Eliminato',
       domanda_addtofriend: 'Aggiungere agli amici {username}?',
       domanda_addtohandshake: 'Confermi che hai conosciuto personalmente e dai la tua fiducia a {username} ?',
@@ -576,6 +575,7 @@ const msg_it = {
       dateofapproved: 'Approvato',
       dateofbirth: 'Data di Nascita',
       born_city: 'Comune di Nascita',
+      resid_province: 'Indica la Provincia in cui vivi',
       born_province: 'Provincia di Nascita',
       nationality_born: 'Paese di Nascita',
       iscrizione_compilata: 'Iscritto',
@@ -1200,15 +1200,15 @@ const msg_it = {
       compara_euro: 'Compara Euro',
       valuta_per_euro: 'Valuta per Euro',
       fido_scoperto_default: 'Fiducia concessa',
-      fido_scoperto_default_tips: 'Rappresenta quanta moneta puoi creare autonomamente',
+      fido_scoperto_default_tips: 'Rappresenta quanto credito puoi creare autonomamente',
       fido_scoperto_default_grp: 'Fiducia concessa Gruppi',
-      fido_scoperto_default_tips_grp: 'Rappresenta quanta moneta puo creare autonomamente il Gruppo',
+      fido_scoperto_default_tips_grp: 'Rappresenta quanto credito puo creare autonomamente il Gruppo',
       transactionsEnabled: 'Transazioni Abilitate',
       transactionsEnabled_text: 'Le transazioni al Circuito sono attualmente sospese, in attesa di attivare il gruppo territoriale',
       qta_max_default: 'Massimo accumulo',
-      qta_max_default_tips: 'Rappresenta quanta moneta ti è concesso accumulare temporaneamente. Incentiviamo di utilizzarla...',
+      qta_max_default_tips: 'Rappresenta quanto credito ti è concesso accumulare temporaneamente. Incentiviamo di utilizzarla...',
       qta_max_default_grp: 'Massimo accumulo Gruppo',
-      qta_max_default_tips_grp: 'Rappresenta quanta moneta è concesso accumulare temporaneamente al Gruppo. Incentiviamo di utilizzarla...',
+      qta_max_default_tips_grp: 'Rappresenta quanto credito è concesso accumulare temporaneamente al Gruppo. Incentiviamo di utilizzarla...',
       data_costituz: 'Data Costituzione',
       deperimento: 'Deperimento',
       freq_deper: 'Frequenza Deperimento',
@@ -1248,19 +1248,19 @@ const msg_it = {
       domanda_removeadminofcircuit: 'Rimuovere {username} dall\' incarico di Amministratore del CIrcuito {circuitname} ?',
       domanda_refuse_circuit: 'Rifiutare la richiesta di {username} per entrare nel Circuito {circuitname}?',
       refusedcircuit: 'Rifiutato a {username} la richiesta di entrare nel Circuito',
-      sendcoins: 'Invia Monete',
+      sendcoins: 'Invia RIS',
       sendcoins_tocom: 'Invia a Conto Comunitario',
       sendcoinsto: 'Invia {qty} {coin} a {dest}',
       question_sendcoinsto: 'Inviare {qty} {coin} a {dest}?',
       question_sendcoinsto_from: 'Inviare {qty} {coin} da {from} a {dest}?',
-      coins_sendrequest_sent: 'Richiesta d\'invio monete avvenuto',
-      coins_sendrequest_failed: 'Richiesta d\'invio monete non avvenuta, riprovare',
-      coins_accepted: 'Monete accettate',
-      coins_refused: 'Monete rifiutate',
-      accept_coins: 'Accetta Monete',
+      coins_sendrequest_sent: 'Richiesta d\'invio RIS avvenuto',
+      coins_sendrequest_failed: 'Richiesta d\'invio RIS non avvenuta, riprovare',
+      coins_accepted: 'RIS accettati',
+      coins_refused: 'RIS rifiutate',
+      accept_coins: 'Accetta RIS',
       accept_coins_qty: 'Accetta {qty} {symbol} !',
       refuse_coins_qty: 'Rifiuta',
-      refuse_coins: 'Rifiuta Monete',
+      refuse_coins: 'Rifiuta RIS',
       movements: 'Movimenti',
       contocomunitario: 'Conto Comunitario',
       conticollettivi: 'Conti Collettivi',
@@ -1287,7 +1287,7 @@ const msg_it = {
       importo_iniziale: 'Importo Iniziale',
       saldo: 'Saldo',
       dispon: 'Disponib.',
-      saldo_tips: 'Rappresenta quanta moneta ho accumulato. Ma posso andare anche sotto fino a {fido} {symbol}',
+      saldo_tips: 'Rappresenta quanto credito ho accumulato. Ma posso andare anche sotto fino a {fido} {symbol}',
       user: 'Utente',
     },
 
@@ -1312,8 +1312,8 @@ const msg_it = {
       causal_IdRec: 'Id Record Causale',
       residual: 'Residuo',
       expiringDate: 'Data Scadenza',
-      movin: 'Monete Ricevute',
-      movout: 'Monete Inviate',
+      movin: 'RIS Ricevuti',
+      movout: 'RIS Inviati',
       from: 'Inviate da:',
       fromCColl: 'Inviate dal Conto Collettivo:',
       fromCCom: 'Inviate dal Conto Comunitario:',
@@ -1389,7 +1389,7 @@ const msg_it = {
       showNL: 'Newsletter',
       showMsgs: 'Messaggi',
       showNotif: 'Notifiche',
-      showCoins: 'Monete',
+      showCoins: 'RIS',
       showNameSurname: 'Mostra Nome e Cognome',
       showCompetenze: 'Mostra Competenze',
       showConnected: 'Stato Connessione',
diff --git a/src/store/Modules/costanti.ts b/src/store/Modules/costanti.ts
index c08357b0..84b00b3e 100755
--- a/src/store/Modules/costanti.ts
+++ b/src/store/Modules/costanti.ts
@@ -149,7 +149,7 @@ export const costanti = {
     {
       visible: false,
       title: 'Circuiti RIS',
-      subtitle: 'Unisciti al circuito della tua provincia per utilizzare <strong>i RIS come moneta di scambio</strong>',
+      subtitle: 'Unisciti al circuito della tua provincia per utilizzare <strong>i RIS come strumento di scambio</strong>',
       to: '/circuits',
       table: 'circuits',
       icon: 'fas fa-coins',
diff --git a/src/views/user/mycircuit/mycircuit.vue b/src/views/user/mycircuit/mycircuit.vue
index 7081fd9e..1033c7a2 100755
--- a/src/views/user/mycircuit/mycircuit.vue
+++ b/src/views/user/mycircuit/mycircuit.vue
@@ -79,14 +79,14 @@
             >
               <template v-slot:avatar>
                 <q-icon
-                  name="fas fa-exclamation-triangle"
-                  color="yellow"
-                  size="xs"
+                  name="fas fa-info"
+                  color="red"
+                  size="sm"
                 />
               </template>
 
               <em style="font-weight: bold">{{
-                $t('db.insertgoodorservices_to_start_circuit')
+                $t('db.insertgoodorservices_to_enter_circuit')
               }}</em
               ><br />
             </q-banner>
@@ -98,9 +98,10 @@
             >
               <template v-slot:avatar>
                 <q-icon
-                  name="fas fa-exclamation-triangle"
-                  color="yellow"
-                  size="xs"
+                  class="vertical-align center"
+                  name="fas fa-info"
+                  color="red"
+                  size="sm"
                 />
               </template>
 
@@ -112,7 +113,6 @@
 
             <q-btn
               v-if="
-                userStore.my.profile.calc.numGoodsAndServices > 0 &&
                 !userStore.IsMyCircuitByName(circuit.name) &&
                 !userStore.IsAskedCircuitByName(circuit.name) &&
                 !userStore.IsRefusedCircuitByName(circuit.name)