diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index f44f6518..79103b01 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -207,7 +207,7 @@ export const shared_consts = { TABLES_ORDER_DATE_UPDATED: ['myskills', 'myhosps', 'mygoods'], TABLES_ORDER_DESCR: ['mygroups'], - TABLES_VISU_IMG: ['myskills', 'mybachecas', 'myhosps', 'mygoods', 'mygroups'], + TABLES_VISU_IMG: ['myskills', 'myhosps', 'mygoods', 'mygroups'], TABLES_DIRECTORY_A_PARTE: ['mygroups'], TABLES_WITH_ADMINS: ['mygroups', 'circuits'], TABLES_DIRECTORY_SINGLE_IMG: ['circuits'], diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts index 9b1675de..bd064ca0 100755 --- a/src/components/CGridTableRec/CGridTableRec.ts +++ b/src/components/CGridTableRec/CGridTableRec.ts @@ -643,10 +643,11 @@ export default defineComponent({ function getObjSort(sortBy: any, descending: any) { let myobj: any = {} if (tools.isObject(sortBy)) { + console.log('sortBy', sortBy) return sortBy } else if (sortBy) { sortBy = sortBy + '' - descending = descending + '' + // descending = descending + '' let arrsort = (sortBy && sortBy.indexOf(',') > 0) ? sortBy.split(',') : []; let arrdescending = (descending && descending.lenght > 1 && descending.indexOf(',') > 0) ? descending.split(',') : []; if (arrsort.length > 0) { @@ -660,6 +661,7 @@ export default defineComponent({ } } + console.log('myobj', myobj) return myobj } diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue index d3ef4f04..c1c65401 100755 --- a/src/components/CGridTableRec/CGridTableRec.vue +++ b/src/components/CGridTableRec/CGridTableRec.vue @@ -249,7 +249,14 @@ color="positive" icon="fas fa-filter" @click="showfilter = !showfilter" - > {{ getNumFilterSelected() }} + > + {{ getNumFilterSelected() }} +
+ {{ + (actmonth = tools.getstrMonth(row.dateTimeStart)) + }} +
+
+ {{ tools.getstrMonth(row.dateTimeStart) }} +
+
+ +
+
+
+ +
@@ -1090,7 +1116,6 @@ @hide="hidewindow" :maximized="$q.screen.lt.sm" > - - + diff --git a/src/components/CMyRecCard/CMyRecCard.vue b/src/components/CMyRecCard/CMyRecCard.vue index a7b570f3..f5d54e44 100755 --- a/src/components/CMyRecCard/CMyRecCard.vue +++ b/src/components/CMyRecCard/CMyRecCard.vue @@ -11,21 +11,50 @@ : ``) " > +
+
+
+
+ {{ + tools.getDayOfWeek(myrec.dateTimeStart) + }} + {{ + tools.getstrDay(myrec.dateTimeStart) + }} +
+
+
+ +
+ {{tools.getstrDateTimeEvent($t, myrec, false)}}
+ +
+
+
- + dal {{tools.getstrVeryShortDate(myrec.dateStart) }} al {{ tools.getstrVeryShortDate(myrec.dateEnd) }} --> - {{ myrec.descr }}
diff --git a/src/css/app.scss b/src/css/app.scss index 9def880b..666c1a86 100755 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -1650,3 +1650,26 @@ h3 { .butt_green{ background-color: rgb(202, 232, 202) !important; } + +.ev_dayofweek{ + color: grey; + font-size: 0.85rem; + text-transform: uppercase; + text-align: center; + margin-bottom: -4px; +} +.ev_day{ + color: black; + font-size: 1.25rem; + font-weight: bold; + text-align: center; +} + +.col-105{ + height: auto; + width: 90%; +} +.col-15{ + height: auto; + width: 10%; +} diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts index 2887ba3b..d5ca6214 100644 --- a/src/store/Modules/tools.ts +++ b/src/store/Modules/tools.ts @@ -3043,6 +3043,16 @@ export const tools = { if (mytimestamp) return date.formatDate(mytimestamp, 'DD/MM/YYYY') return '' }, + getstrMonth(mytimestamp: Date | number | string | undefined) { + // console.log('getstrDate', mytimestamp) + if (mytimestamp) return date.formatDate(mytimestamp, 'MMMM YYYY') + return '' + }, + + getstrDay(mytimestamp: Date | number | string | undefined) { + if (mytimestamp) return date.formatDate(mytimestamp, 'D') + return '' + }, getstrDateYY(mytimestamp: Date | number | string | undefined) { // console.log('getstrDate', mytimestamp)