surya/salvato.newfreeplanet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Aggiornamento a 0.6.1"

Browse Source 
This reverts commit 701e1f1968.
This commit is contained in:
Surya Paolo
2023-04-07 20:07:56 +02:00
parent 9c08ebaacd
commit a8eb6344ef
10 changed files with 44 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/components/CGridTableRec/CGridTableRec.vue
View File

@@ -1103,22 +1103,7 @@
:prop_myrec="myrecdialog"
>
</CMyCardCircuitPopup>
<CMyCardService v-else-if="mytable === 'myskills'"
<<<<<<< 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)
<CMyCardService v-else-if="shared_consts.TABLES_FAVORITE_BOOKMARK.includes(mytable)"
:table="mytable" :prop_myrec="myrecdialog">
</CMyCardService>
<CMyCardPopup v-else :table="mytable" :prop_myrec="myrecdialog">

30
src/components/CMyCardService/CMyCardService.vue
View File

@@ -146,15 +146,31 @@
}}</q-item-label>
</q-item-section>
</q-item>
<<<<<<< HEAD
<<<<<<< HEAD
<q-item>
=======
=======
>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
<q-item v-if="myrec.dateTimeStart">
<q-item-section avatar>
<q-icon color="green" name="far fa-calendar-alt" />
</q-item-section>
<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>