Revert "Aggiornamento a 0.6.1"

This reverts commit 701e1f1968.

.env.development

@@ -1,12 +1,4 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-APP_VERSION="0.5.84"
-=======
 APP_VERSION="0.5.85"
->>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
-=======
-APP_VERSION="0.5.85"
->>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL="newfreeplanet"

.env.example.production

@@ -1,12 +1,4 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-APP_VERSION="0.5.84"
-=======
 APP_VERSION="0.5.85"
->>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
-=======
-APP_VERSION="0.5.85"
->>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet

.env.test.risosrv

@@ -1,12 +1,4 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-APP_VERSION="0.5.84"
-=======
 APP_VERSION="0.5.85"
->>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
-=======
-APP_VERSION="0.5.85"
->>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet

_ALL_SITES/riso.app/.env.development

@@ -1,12 +1,4 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-APP_VERSION="0.5.84"
-=======
 APP_VERSION="0.5.85"
->>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
-=======
-APP_VERSION="0.5.85"
->>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL="newfreeplanet"

_ALL_SITES/riso.app/.env.production

@@ -1,12 +1,4 @@
-<<<<<<< HEAD
+APP_VERSION="0.6.2"
-<<<<<<< HEAD
-APP_VERSION="0.5.84"
-=======
-APP_VERSION="0.5.85"
->>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
-=======
-APP_VERSION="0.5.85"
->>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet

_ALL_SITES/terradellavisione.app/.env.development

@@ -1,12 +1,4 @@
-<<<<<<< HEAD
+APP_VERSION="0.6.2"
-<<<<<<< HEAD
-APP_VERSION="0.5.84"
-=======
-APP_VERSION="0.5.85"
->>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
-=======
-APP_VERSION="0.5.85"
->>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="14"
 DIRECTORY_LOCAL="newfreeplanet"

src/components/CGridTableRec/CGridTableRec.vue

@@ -1103,22 +1103,7 @@
         :prop_myrec="myrecdialog"
       >
       </CMyCardCircuitPopup>
-      <CMyCardService v-else-if="mytable === 'myskills'"
+      <CMyCardService v-else-if="shared_consts.TABLES_FAVORITE_BOOKMARK.includes(mytable)"
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
->>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
-        :table="mytable" :prop_myrec="myrecdialog">
-      </CMyCardService>
-      <CMyCardService v-else-if="mytable === 'mygoods'"
-        :table="mytable" :prop_myrec="myrecdialog">
-      </CMyCardService>
-      <CMyCardService v-else-if="mytable === 'myhosps'"
-<<<<<<< HEAD
->>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
-=======
->>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
         :table="mytable" :prop_myrec="myrecdialog">
       </CMyCardService>
       <CMyCardPopup v-else :table="mytable" :prop_myrec="myrecdialog">

src/components/CMyCardService/CMyCardService.vue

@@ -146,15 +146,31 @@
               }}</q-item-label>
             </q-item-section>
           </q-item>
-<<<<<<< HEAD
+
-<<<<<<< HEAD
+          <q-item v-if="myrec.dateTimeStart">
-          <q-item>
+            <q-item-section avatar>
-=======
+              <q-icon color="green" name="far fa-calendar-alt" />
-=======
+            </q-item-section>
->>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
+
+            <q-item-section>
+              <q-item-label>
+                <span>{{tools.getstrDateMonthTimeLong(myrec.dateTimeStart)}}</span>
+              </q-item-label>
+            </q-item-section>
+          </q-item>
+          <q-item v-if="myrec.dateTimeEnd">
+            <q-item-section avatar>
+              <q-icon color="red" name="far fa-calendar-alt" />
+            </q-item-section>
+
+            <q-item-section>
+              <q-item-label>
+                <span>{{tools.getstrDateMonthTimeLong(myrec.dateTimeEnd)}}</span>
+              </q-item-label>
+            </q-item-section>
+          </q-item>
 
           <q-item v-if="getSectorByRec(myrec)">
->>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
             <q-item-section avatar>
               <q-icon color="blue" name="category" />
             </q-item-section>

src/css/app.scss

@@ -1595,8 +1595,6 @@ h3 {
   text-align: right;
   color: grey;
 }
-<<<<<<< HEAD
-=======
 
 .buttons_bottom {
   max-width: 400px;
@@ -1630,7 +1628,21 @@ h3 {
   color: grey;
   font-size: 0.8rem;
 }
-<<<<<<< HEAD
+
->>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
+.butt_rounded{
-=======
+  border-radius: 12px;
->>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
+}
+
+.body--light {
+  .butt_rounded{
+    background-color: rgb(234, 241, 244);
+  }
+}.body--dark {
+  .butt_rounded{
+    background-color: black;
+  }
+}
+
+.q-mx-xxs {
+  margin-left: 2px;
+}

src/statics/lang/it.js

@@ -1488,16 +1488,8 @@ const msg_it = {
       favorite_unset: 'Rimosso dai Preferiti',
       bookmark_set: 'Aggiunto ai Segnalibri',
       bookmark_unset: 'Rimosso dai Segnalibri',
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       favorite: 'Utenti Favoriti',
       bookmark: 'Utenti Segnalibri',
->>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
-=======
-      favorite: 'Utenti Favoriti',
-      bookmark: 'Utenti Segnalibri',
->>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
     },
   },