surya/newfreeplanet_OLD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Aggiunto filtro numMaxPeopleHosp

Browse Source
This commit is contained in:
Paolo Arena
2022-05-08 13:19:35 +02:00
parent 245217607d
commit 4beee58a42
29 changed files with 294 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

@@ -1,4 +1,4 @@
APP_VERSION="0.3.18"
APP_VERSION="0.3.19"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL="newfreeplanet"

2
.env.example.production
View File

@@ -1,4 +1,4 @@
APP_VERSION="0.3.18"
APP_VERSION="0.3.19"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet

2
_ALL_SITES/insiemesipuo.app/.env.development
View File

@@ -1,4 +1,4 @@
APP_VERSION="0.3.18"
APP_VERSION="0.3.19"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL="newfreeplanet"

2
_ALL_SITES/popolodelnuovomondo.app/.env.development
View File

@@ -1,4 +1,4 @@
APP_VERSION="0.3.18"
APP_VERSION="0.3.19"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="12"
DIRECTORY_LOCAL="newfreeplanet"

2
_ALL_SITES/riso.app/.env.development
View File

@@ -1,4 +1,4 @@
APP_VERSION="0.3.18"
APP_VERSION="0.3.19"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL="newfreeplanet"

2
_ALL_SITES/riso.app/.env.test
View File

@@ -1,4 +1,4 @@
APP_VERSION="0.3.18"
APP_VERSION="0.3.19"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet

2
package.json
View File

@@ -1,6 +1,6 @@
{
"name": "riso",
"version": "0.3.18",
"version": "0.3.19",
"description": "Riso",
"productName": "Riso",
"author": "Paolo Arena",

41
src/common/shared_vuejs.ts
View File

@@ -95,6 +95,7 @@ export const shared_consts = {
TABLES_USER_INCLUDE_MY: ['mygroups'],
TABLES_GETCOMPLETEREC: ['myskills', 'mybachecas', 'myhosps', 'mygoods'],
TABLES_WITH_FILTER_FIELD: ['caldate'],
COL_WITH_FILTER_GTE: ['numMaxPeopleHosp'],
TABLES_WITH_DATE: ['mybachecas', 'myhosps'],
TABLES_WITH_SORTING: ['mybachecas', 'myhosps'],
TABLES_REC_ID: ['skills', 'goods', 'subskills', 'myskills', 'mybachecas', 'myhosps', 'mygoods'],
@@ -346,10 +347,6 @@ export const shared_consts = {
],
Preferences: [
{
value: 1,
label: 'Si accettano bambini',
},
{
value: 2,
label: 'Si accettano cani',
@@ -386,6 +383,42 @@ export const shared_consts = {
value: 10,
label: 'Cucina Vegana',
},
{
value: 11,
label: 'Uso della Cucina',
},
{
value: 12,
label: 'Uso della Lavatrice',
},
{
value: 13,
label: 'Aria condizionata',
},
{
value: 14,
label: 'Ventilatore',
},
{
value: 15,
label: 'Doccia all\'aperto',
},
{
value: 16,
label: 'TV',
},
{
value: 17,
label: 'Eventi consentiti',
},
{
value: 18,
label: 'Adatto a bambini da 2 a 12 anni',
},
{
value: 19,
label: 'Adatto ai neonati (fino ai 2 anni)',
},
],
Regions: [

2
src/components/CDateTime/CDateTime.ts
View File

@@ -76,7 +76,7 @@ export default defineComponent({
}
function Opening() {
// console.log('Opening', 'myvalue', myvalue, 'value', value)
console.log('Opening', 'myvalue', myvalue.value)
saveit.value = false
valueprec.value = myvalue.value
if (myvalue.value === '') {

2
src/components/CDateTime/CDateTime.vue
View File

@@ -38,7 +38,7 @@
</template>
<template v-slot:append>
<q-icon v-if="canEdit" name="event" class="cursor-pointer">
<q-popup-proxy v-model="showDateTimeScroller" @before-show="Opening" @before-hide="Closing">
<q-popup-proxy transition-show="flip-up" v-model="showDateTimeScroller" @before-show="Opening" @before-hide="Closing">
<div class="q-gutter-md row items-start">
<q-date

8
src/components/CFinder/CFinder.ts
View File

@@ -1025,8 +1025,15 @@ export default defineComponent({
}
} else if (props.table === toolsext.TABMYHOSPS) {
let obj2: any = {}
if (myrecfiltertoggle.value === tools.FILTER_ALL) {
obj2['visibile'] = true
}
return {
// Servizi
filtersearch2: [obj2],
lookup1: {
lk_tab: 'users',
lk_LF: 'userId',
@@ -1041,6 +1048,7 @@ export default defineComponent({
lk_as: 'mycities',
af_objId_tab: '',
lk_proj: {
visibile: 1,
typeHosp: 1,
numMaxPeopleHosp: 1,
accomodation: 1,

7
src/components/CGridTableRec/CGridTableRec.ts
View File

@@ -445,6 +445,7 @@ export default defineComponent({
let filtersearch3or: any[] = []
let filtersearch3and: any[] = []
let filtercustom: any[] = [...props.filtercustom]
let filter_gte: any[] = []
let recSector = null
let recSectorGood = null
@@ -550,6 +551,10 @@ export default defineComponent({
}
}
} else if (shared_consts.COL_WITH_FILTER_GTE.includes(item.key)) {
objitem[item.key] = item.value
filter_gte.push(objitem)
} else if (item.value > 0) {
objitem[item.key] = item.value
filtersearch.push(objitem)
@@ -676,6 +681,8 @@ export default defineComponent({
filtersearch3and: filtersearch3and,
// @ts-ignore
filtercustom: filtercustom,
// @ts-ignore
filter_gte,
sortBy: myobj,
descending,
userId: userStore.my._id,

7
src/components/CMyPopupEdit/CMyPopupEdit.ts
View File

@@ -395,6 +395,12 @@ export default defineComponent({
emit('show')
}
function OpenEditDateToday() {
// console.log('OpenEdit')
myvalue.value = new Date()
emit('show')
}
/*function getval() {
let myval: any = 'false'
@@ -721,6 +727,7 @@ export default defineComponent({
changevalRecHours,
updatedata,
OpenEdit,
OpenEditDateToday,
SaveValueInt,
annulla,
Savedb,

20
src/components/CMyPopupEdit/CMyPopupEdit.vue
View File

@@ -9,21 +9,9 @@
<!-- Edit Value -->
<div v-if="col.fieldtype === costanti.FieldType.boolean">
<div v-if="isInModif">
<span v-if="insertMode">
<q-checkbox
v-model="myvalue"
@update:model-value="changevalRec"
:label="col.label">
</q-checkbox>
</span>
<span v-else>
<q-checkbox
v-model="myvalue"
@update:model-value="changevalRec"
:label="col.title">
</q-checkbox>
<span v-html="visuValByType(myvalue, col, row)"></span>
</span>
<q-toggle
dark color="green" v-model="myvalue" :label="col.title ? col.title : col.label"
@update:model-value="changevalRec"></q-toggle>
</div>
<div v-else>
<q-toggle
@@ -288,7 +276,7 @@
<div v-else-if="canEdit">
<q-btn
dense
color="primary" @click="OpenEdit"
color="primary" @click="OpenEditDateToday"
icon="fas fa-calendar-day"
/>
</div>

1
src/components/CShareWithUs/CShareWithUs.ts
View File

@@ -68,6 +68,7 @@ export default defineComponent({
filtersearch: '',
filtersearch2: '',
filtercustom: '',
filter_gte: '',
sortBy: myobj,
descending,
userId: userStore.my._id

15
src/components/CSignUp/CSignUp.vue
View File

@@ -28,16 +28,17 @@
<q-btn class="q-ma-sm" color="positive" icon="fas fa-home" label="Se sei già Registrato CLICCA QUI" to="/"></q-btn>
<q-banner
rounded
class="bg-warning text-black"
style="text-align: center;"
>
<span class="mybanner" v-html="t('pages.need_Telegram')"></span>
</q-banner>
<div v-if="!isalreadyReg">
<CTitleBanner :title="$t('pages.SignUp')"></CTitleBanner>
<q-banner
rounded
class="bg-warning text-black"
style="text-align: center;"
>
<span class="mybanner" v-html="t('pages.need_Telegram')"></span>
</q-banner>
</div>
</div>

2
src/db/lang/ws_it.js
View File

@@ -46,7 +46,7 @@ const msg_website_it = {
presentazione: 'Presentazione',
presentazione2: 'Presentazione',
invita: 'Invita Persone',
SignUp: 'Nuova Registrazione',
SignUp: 'Modulo di Registrazione:',
need_Telegram: 'Per poter utilizzare la Piattaforma occorre avere Telegram installato.<br><a href="https://play.google.com/store/apps/details?id=org.telegram.messenger" target="_blank">Clicca qui per scaricarlo</a>',
Registrazione_Con_Bot: 'Per Registrarsi occorre prima verificarsi su Telegram sul <strong>BOT RISO</strong>',
SignUpIscrizione: 'Diventa Socio CNM',

107
src/db/static_data.ts
View File

@@ -109,65 +109,112 @@ const routes_admin: IListRoutes[] = [
}
]
const routes_newsletter: IListRoutes[] = [
{
active: true,
order: 10,
name: 'newsletter.template', path: '/admin/newsletter/templemail', materialIcon: 'fas fa-users',
component: () => import('@/rootgen/admin/newsletter/newsletter.vue'),
inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true
inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true, noroute: true
},
{
active: true,
order: 20,
name: 'newsletter.sendemail', path: '/admin/newsletter/newnewsletter', materialIcon: 'fas fa-users',
component: () => import('@/rootgen/admin/newsletter/newsletter.vue'),
inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true
inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true, noroute: true
},
{
active: true,
order: 30,
name: 'newsletter.check', path: '/admin/newsletter/check', materialIcon: 'fas fa-users',
component: () => import('@/rootgen/admin/newsletter/newsletter.vue'),
inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true
inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true, noroute: true
},
{
active: true,
order: 40,
name: 'newsletter.sent', path: '/admin/newsletter/newslist', materialIcon: 'fas fa-users',
component: () => import('@/rootgen/admin/newsletter/newsletter.vue'),
inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true
inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true, noroute: true
},
{
active: true,
order: 50,
name: 'newsletter.mailinglist', path: '/admin/newsletter/mailinglist', materialIcon: 'fas fa-users',
component: () => import('@/rootgen/admin/newsletter/newsletter.vue'),
inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true
inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true, noroute: true
},
{
active: true,
order: 60,
name: 'newsletter.settings', path: '/admin/newsletter/settings', materialIcon: 'fas fa-users',
component: () => import('@/rootgen/admin/newsletter/newsletter.vue'),
inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true
inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true, noroute: true
},
{
active: true,
order: 70,
name: 'newsletter.serversettings', path: '/admin/newsletter/main_settings', materialIcon: 'fas fa-users',
component: () => import('@/rootgen/admin/newsletter/newsletter.vue'),
inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true
inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true, noroute: true
},
{
active: true,
order: 80,
name: 'newsletter.others', path: '/admin/newsletter/events', materialIcon: 'fas fa-users',
component: () => import('@/rootgen/admin/newsletter/newsletter.vue'),
inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true
inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true, noroute: true
}
]
const routes_ris: IListRoutes[] = [
{
active: true,
order: 10,
path: '/admin/ris/circuitslist',
materialIcon: 'fas fa-users',
name: 'otherpages.admin.circuitslist',
component: () => import('@/rootgen/admin/circuitsList/circuitsList.vue'),
inmenu: true,
submenu: true,
level_parent: 0.5,
level_child: 0.5,
onlyManager: true,
onlyTutor: true
},
{
active: true,
order: 20,
path: '/admin/ris/accountslist',
materialIcon: 'fas fa-users',
name: 'otherpages.admin.accountslist',
component: () => import('@/rootgen/admin/accountsList/accountsList.vue'),
inmenu: true,
submenu: true,
level_parent: 0.5,
level_child: 0.5,
onlyManager: true,
onlyTutor: true
},
{
active: true,
order: 30,
path: '/admin/ris/movslist',
materialIcon: 'fas fa-users',
name: 'otherpages.admin.movslist',
component: () => import('@/rootgen/admin/movsList/movsList.vue'),
inmenu: true,
submenu: true,
level_parent: 0.5,
level_child: 0.5,
onlyManager: true,
onlyTutor: true
},
]
const routes_manager: IListRoutes[] = [
{
active: functionality.BOOKING_EVENTS,
@@ -199,34 +246,6 @@ const routes_manager: IListRoutes[] = [
onlyManager: true,
onlyTutor: true
},
{
active: true,
order: 11,
path: '/admin/circuitslist',
materialIcon: 'fas fa-users',
name: 'otherpages.admin.circuitslist',
component: () => import('@/rootgen/admin/circuitsList/circuitsList.vue'),
inmenu: true,
submenu: true,
level_parent: 0,
level_child: 0.5,
onlyManager: true,
onlyTutor: true
},
{
active: true,
order: 12,
path: '/admin/accountslist',
materialIcon: 'fas fa-users',
name: 'otherpages.admin.accountslist',
component: () => import('@/rootgen/admin/accountsList/accountsList.vue'),
inmenu: true,
submenu: true,
level_parent: 0,
level_child: 0.5,
onlyManager: true,
onlyTutor: true
},
/*
{
active: true,
@@ -246,6 +265,22 @@ const routes_manager: IListRoutes[] = [
*/
{
active: true,
path: '/admin/ris',
order: 60,
faIcon: 'fa fa-list-alt',
materialIcon: 'fas fa-users',
name: 'otherpages.admin.monete',
routes2: routes_ris,
inmenu: false,
submenu: true,
level_parent: 0.5,
level_child: 0.5,
solotitle: true,
onlyAdmin: true,
onlyManager: true
},
{
active: false,
order: 10,
path: '/admin/zoomlist',
materialIcon: 'fas fa-users',

3
src/model/GlobalStore.ts
View File

@@ -344,6 +344,7 @@ export interface IListRoutes {
solotitle?: boolean
infooter?: boolean
submenu?: boolean
noroute?: boolean
onlyAdmin?: boolean
onlyif_logged?: boolean
onlyManager?: boolean
@@ -522,6 +523,7 @@ export interface IParamsQuery {
filtersearch: string
filtersearch2: string
filtercustom: string
filter_gte: string
lookup1?: IParLookup
lookup2?: IParLookup
lookup3?: IParLookup
@@ -844,6 +846,7 @@ export interface IAccomodation {
export interface IMyHosp {
_id: number
visibile: boolean
typeHosp: number
numMaxPeopleHosp: number
accomodation: IAccomodation[]

1
src/rootgen/admin/importdata/importdata.ts
View File

@@ -93,6 +93,7 @@ export default defineComponent({
filtersearch: '',
filtersearch2: '',
filtercustom: '',
filter_gte: '',
sortBy: myobj,
descending,
userId: ''

1
src/rootgen/admin/movsList/index.ts Executable file
View File

@@ -0,0 +1 @@
export {default as movsList} from './movsList.vue'

0
src/rootgen/admin/movsList/movsList.scss Executable file
View File

35
src/rootgen/admin/movsList/movsList.ts Executable file
View File

@@ -0,0 +1,35 @@
import { defineComponent, onMounted, ref } from 'vue'
import { CMyPage } from '@/components/CMyPage'
import { CGridTableRec } from '@/components/CGridTableRec'
import { tools } from '@store/Modules/tools'
import { static_data } from '@/db/static_data'
import { fieldsTable } from '@src/store/Modules/fieldsTable'
import { shared_consts } from '@/common/shared_vuejs'
export default defineComponent({
name: 'movsList',
// @ts-ignore
components: { CGridTableRec, CMyPage },
setup() {
const arrfilterand: any = ref([])
function mounted() {
if (tools.appid() === tools.IDAPP_RISO) {
arrfilterand.value = [
]
}
}
onMounted(mounted)
return {
arrfilterand,
fieldsTable,
}
}
})

22
src/rootgen/admin/movsList/movsList.vue Executable file
View File

@@ -0,0 +1,22 @@
<template>
<CMyPage img="" :title="$t('otherpages.admin.movsList')" keywords="" description="Lista Movimenti">
<CGridTableRec
prop_mytable="movements"
prop_mytitle="Lista Movimenti"
:prop_mycolumns="fieldsTable.movslist()"
prop_colkey="_id"
nodataLabel="Nessun Movimento"
noresultLabel="Il filtro selezionato non ha trovato nessun risultato"
:arrfilters="arrfilterand">
</CGridTableRec>
</CMyPage>
</template>
<script lang="ts" src="./movsList.ts">
</script>
<style lang="scss" scoped>
@import './movsList.scss';
</style>

2
src/rootgen/admin/newsletter/newsletter.ts
View File

@@ -56,7 +56,7 @@ export default defineComponent({
const emailtextheader = ref('')
const eseguipolling = ref(false)
const idparam = computed( () => $route.params.idparam.toString())
const idparam = computed( () => $route.params.idparam ? $route.params.idparam.toString() : '')
async function mounted() {

28
src/statics/lang/it.js
View File

@@ -47,8 +47,9 @@ const msg_it = {
eventlist: 'Le tue Prenotazioni',
usereventlist: 'Prenotazioni Utenti',
userlist: 'Lista Utenti',
circuitslist: 'Lista Circuiti',
accountslist: 'Lista Conti',
circuitslist: 'Circuiti',
accountslist: 'Conti',
movslist: 'Movimenti',
iscritticonacreis: 'Iscritti Conacreis',
zoomlist: 'Calendario Zoom',
extralist: 'Lista Extra',
@@ -57,6 +58,7 @@ const msg_it = {
navi: 'Navi',
listadoni_navi: 'Lista Doni Navi',
newsletter: 'Newsletter',
monete: 'Monete',
pages: 'Pagine',
media: 'Media',
gallery: 'Gallerie',
@@ -792,6 +794,9 @@ const msg_it = {
typol_code: 'Codice Tipologia',
order: 'Ordinamento',
},
ris: {
menu: 'Ris',
},
newsletter: {
title: 'Desideri ricevere la nostra Newsletter?',
name: 'Il tuo Nome',
@@ -961,6 +966,7 @@ const msg_it = {
link_grp: 'Link Territoriale',
},
hosps: {
visibile: 'Pubblica',
typeHosp: 'Tipologia',
numMaxPeopleHosp: 'N° max Ospiti',
accomodation: {
@@ -1007,15 +1013,15 @@ const msg_it = {
},
movement: {
transactionDate: '',
accountFromId: '',
accountToId: '',
amount: '',
causal: '',
causal_table: '',
causal_IdRec: '',
residual: '',
expiringDate: '',
transactionDate: 'Data Transaz',
accountFromId: 'Dal Conto',
accountToId: 'Al Conto',
amount: 'Quantità',
causal: 'Causale',
causal_table: 'Tabella Causale',
causal_IdRec: 'Id Record Causale',
residual: 'Residuo',
expiringDate: 'Data Scadenza',
},

67
src/store/Modules/fieldsTable.ts
View File

@@ -540,7 +540,7 @@ export const colmyUserGroup = [
name: 'groupname', label_trans: 'reg.groupname', required: true,
maxlength: 30,
allowchar: costanti.ALLOWCHAR_CODE,
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage,
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit,
}),
AddCol({ name: 'title', label_trans: 'reg.name', required: true, noshowlabel: true, maxlength: 40 }),
AddCol({
@@ -592,16 +592,20 @@ export const colmyUserGroup = [
jointable: 'friendsandme',
field_outtype: costanti.FieldType.object,
}),
AddCol({ name: 'date_created', label_trans: 'reg.pub_created', fieldtype: costanti.FieldType.onlydate,
AddCol({
name: 'date_created', label_trans: 'reg.pub_created', fieldtype: costanti.FieldType.onlydate,
required: false,
visible: false,
sortable: true,
showWhen: 0}),
AddCol({ name: 'date_updated', label_trans: 'reg.pub_updated', fieldtype: costanti.FieldType.onlydate,
showWhen: 0
}),
AddCol({
name: 'date_updated', label_trans: 'reg.pub_updated', fieldtype: costanti.FieldType.onlydate,
required: false,
visible: false,
sortable: true,
showWhen: 0}),
showWhen: 0
}),
AddCol({
name: 'photos',
label_trans: 'skill.photos',
@@ -729,11 +733,13 @@ export const colmyGoods = [
//icon: 'fas fa-hands-helping',
// isadvanced_field: true,
}),
AddCol({ name: 'date_created', label_trans: 'event.dateCreated', fieldtype: costanti.FieldType.onlydate,
AddCol({
name: 'date_created', label_trans: 'event.dateCreated', fieldtype: costanti.FieldType.onlydate,
required: false,
visible: false,
sortable: true,
showWhen: 0}),
showWhen: 0
}),
AddCol({
name: 'photos',
label_trans: 'skill.photos',
@@ -911,11 +917,13 @@ export const colmySkills = [
icon: 'grading',
isadvanced_field: true,
}),
AddCol({ name: 'date_created', label_trans: 'event.dateCreated', fieldtype: costanti.FieldType.onlydate,
AddCol({
name: 'date_created', label_trans: 'event.dateCreated', fieldtype: costanti.FieldType.onlydate,
required: false,
visible: false,
sortable: true,
showWhen: 0}),
showWhen: 0
}),
AddCol({
name: 'photos',
label_trans: 'skill.photos',
@@ -954,6 +962,11 @@ export const colmyHosp = [
sortable: false,
}),
AddCol({
name: 'visibile', label_trans: 'hosps.visibile', fieldtype: costanti.FieldType.boolean,
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit,
}),
AddCol({
name: 'typeHosp',
label_trans: 'hosps.typeHosp',
@@ -1064,11 +1077,13 @@ export const colmyHosp = [
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
sortable: false,
}),
AddCol({ name: 'date_created', label_trans: 'event.dateCreated', fieldtype: costanti.FieldType.onlydate,
AddCol({
name: 'date_created', label_trans: 'event.dateCreated', fieldtype: costanti.FieldType.onlydate,
required: false,
visible: false,
sortable: true,
showWhen: 0}),
showWhen: 0
}),
AddCol(DuplicateRec),
AddCol(ModifRec),
AddCol(DeleteRec),
@@ -1191,11 +1206,13 @@ export const colmyBachecas = [
visible: false,
sortable: false,
}),*/
AddCol({ name: 'date_created', label_trans: 'event.dateCreated', fieldtype: costanti.FieldType.onlydate,
AddCol({
name: 'date_created', label_trans: 'event.dateCreated', fieldtype: costanti.FieldType.onlydate,
required: false,
visible: false,
sortable: true,
showWhen: 0}),
showWhen: 0
}),
AddCol({
name: 'photos',
label_trans: 'skill.photos',
@@ -1267,7 +1284,14 @@ export const colTableSites = [
AddCol({ name: 'next_payment', label_trans: 'reg.next_payment', fieldtype: costanti.FieldType.onlydate }),
// Configuration
// AddCol({ name: 'confsite.notif_reg', field: 'confsite', subfield: 'notif_reg', label_trans: 'reg.notif_reg', fieldtype: costanti.FieldType.boolean }),
AddCol({ name: 'confsite.options', field: 'confsite', subfield: 'options', label_trans: 'reg.options', fieldtype: costanti.FieldType.binary, jointable: 'confsite_opt', }),
AddCol({
name: 'confsite.options',
field: 'confsite',
subfield: 'options',
label_trans: 'reg.options',
fieldtype: costanti.FieldType.binary,
jointable: 'confsite_opt',
}),
AddCol(DeleteRec),
AddCol(DuplicateRec),
]
@@ -2325,19 +2349,22 @@ export const colTableAccount = [
AddCol({ name: 'deperibile', label_trans: 'account.deperibile', fieldtype: costanti.FieldType.boolean }),
AddCol({ name: 'importo_iniziale', label_trans: 'account.importo_iniziale', fieldtype: costanti.FieldType.number }),
AddCol({ name: 'saldo', label_trans: 'account.saldo', fieldtype: costanti.FieldType.number }),
AddCol(DeleteRec),
AddCol(DuplicateRec),
]
export const colTableMovement = [
AddCol({ name: 'transactionDate', label_trans: 'movement.transactionDate', fieldtype: costanti.FieldType.date }),
AddCol({ name: 'accountFromId', label_trans: 'movement.accountFromId', fieldtype: costanti.FieldType.number }),
AddCol({ name: 'accountToId', label_trans: 'movement.accountToId', fieldtype: costanti.FieldType.number }),
AddCol({ name: 'amount', label_trans: 'movement.amount', fieldtype: costanti.FieldType.number }),
AddCol({ name: 'accountFromId', label_trans: 'movement.accountFromId', fieldtype: costanti.FieldType.number, required: true }),
AddCol({ name: 'accountToId', label_trans: 'movement.accountToId', fieldtype: costanti.FieldType.number, required: true }),
AddCol({ name: 'amount', label_trans: 'movement.amount', fieldtype: costanti.FieldType.number, required: true }),
AddCol({ name: 'causal', label_trans: 'movement.causal' }),
AddCol({ name: 'causal_table', label_trans: 'movement.causal_table' }),
AddCol({ name: 'causal_IdRec', label_trans: 'movement.causal_IdRec', fieldtype: costanti.FieldType.number }),
AddCol({ name: 'residual', label_trans: 'movement.residual', fieldtype: costanti.FieldType.number }),
AddCol({ name: 'expiringDate', label_trans: 'movement.expiringDate', fieldtype: costanti.FieldType.date }),
AddCol(DeleteRec),
AddCol(DuplicateRec),
]
export const fieldsTable = {
@@ -2454,6 +2481,10 @@ export const fieldsTable = {
return colTableAccount
},
movslist() {
return colTableMovement
},
userlist() {
if (static_data.functionality.ENABLE_REG_AYNI) {
return colTableUsers

1
src/store/Modules/tools.ts
View File

@@ -5252,6 +5252,7 @@ export const tools = {
getdefaultnewrec_MyHosp(): any {
return {
visibile: true,
_id: 0,
typeHosp: tools.getSelectionByTable(toolsext.TABTYPEHOSP, 2),
idContribType: tools.getSelectionByTable('contribtypes', []),

11
src/store/globalStore.ts
View File

@@ -392,6 +392,16 @@ export const useGlobalStore = defineStore('GlobalStore', {
static_data.routes = [...static_data.baseroutes, ...arrpagesroute, last]
}
for (const menu of static_data.routes) {
if (menu.active && menu.routes2) {
for (const menu2 of menu.routes2) {
if (menu2.active && !menu2.noroute) {
arrpagesroute.push(menu2)
}
}
}
}
// Sort array
static_data.routes = static_data.routes.sort((a, myb) => a.order - myb.order)
@@ -836,6 +846,7 @@ export const useGlobalStore = defineStore('GlobalStore', {
filtersearch: '',
filtersearch2: '',
filtercustom: '',
filter_gte: '',
sortBy: myobj,
descending,
userId: '',