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

filter visible if selected, different from friends, hosp, and services

Browse Source
This commit is contained in:
Surya Paolo
2023-03-23 00:42:57 +01:00
parent c28c6c4d8b
commit eb53557090
11 changed files with 25 additions and 27 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.5.82"
APP_VERSION="0.5.83"
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.5.82"
APP_VERSION="0.5.83"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet

2
.env.test.risosrv
View File

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

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

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

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

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

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

@@ -1,4 +1,4 @@
APP_VERSION="0.5.82"
APP_VERSION="0.5.83"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="14"
DIRECTORY_LOCAL="newfreeplanet"

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

@@ -609,7 +609,8 @@ export default defineComponent({
table: 'regions',
key: 'idReg',
type: costanti.FieldType.select,
value: tools.getCookie(tools.COOK_SEARCH + 'regions', costanti.FILTER_TUTTI),
value: tools.getCookie(tools.COOK_SEARCH + 'regions_hosp', costanti.FILTER_TUTTI),
keycookie: '_hosp',
addall: true,
arrvalue: [],
filter: null,
@@ -621,7 +622,8 @@ export default defineComponent({
table: 'provinces',
key: 'idProvince',
type: costanti.FieldType.select,
value: tools.getCookie(tools.COOK_SEARCH + 'provinces', costanti.FILTER_TUTTI),
value: tools.getCookie(tools.COOK_SEARCH + 'provinces_hosp', costanti.FILTER_TUTTI),
keycookie: '_hosp',
addall: true,
arrvalue: [],
filter: getFilterProvinceByRegion,
@@ -633,7 +635,8 @@ export default defineComponent({
table: 'cities',
key: 'idCity',
type: costanti.FieldType.select_by_server,
value: tools.getCookie(tools.COOK_SEARCH + 'cities', costanti.FILTER_TUTTI),
value: tools.getCookie(tools.COOK_SEARCH + 'cities_hosp', costanti.FILTER_TUTTI),
keycookie: '_hosp',
addall: true,
arrvalue: [],
useinput: true,
@@ -642,18 +645,6 @@ export default defineComponent({
// param1: shared_consts.PARAM_SHOW_PROVINCE,
tablesel: 'cities',
},
{
label: 'Visiblità',
table: 'pub_to_share',
key: 'pub_to_share',
type: costanti.FieldType.select,
value: tools.getCookie(tools.COOK_SEARCH + 'pub_to_share', shared_consts.PUBTOSHARE.ALL, true),
addall: false,
arrvalue: [],
useinput: true,
filter: null,
tablesel: 'pub_to_share',
},
{
label: 'Tipologia',
table: toolsext.TABTYPEHOSP,

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

@@ -560,7 +560,11 @@ export default defineComponent({
function searchval(newval: any, table: any) {
console.log('REFRR searchval', newval, table)
tools.setCookie(tools.COOK_SEARCH + table, newval)
const myrecfilt = searchList.value.find((rec) => rec.table === table)
let keycookie = tools.COOK_SEARCH + table
if (myrecfilt && myrecfilt.keycookie)
keycookie += myrecfilt.keycookie
tools.setCookie(keycookie, newval)
if (table === toolsext.TABSKILLS) {
const recSector = searchList.value.find((rec) => rec.table === 'sectors')
@@ -909,7 +913,7 @@ export default defineComponent({
}*/
}
// if ((false && nosearch && props.finder) || (props.finder_noNull && nosearch)) {
if ((props.finder_noNull || (props.finder_noNullFilters && filtersearch3and.values.length === 0)) && nosearch) {
if ((props.finder_noNull || (props.finder_noNullFilters && getNumFilterSelected() === 0)) && nosearch) {
returnedData.value = []
returnedCount = 0
return true

1
src/model/GlobalStore.ts
View File

@@ -780,6 +780,7 @@ export interface ISearchList {
useinput: boolean
notinsearch?: boolean
addall?: boolean
keycookie?: string
showcount?: boolean
tablesel?: string
icon?: string

6
src/views/user/myfriends/myfriends.ts
View File

@@ -35,7 +35,8 @@ export default defineComponent({
table: 'regions',
key: 'idReg',
type: costanti.FieldType.select,
value: tools.getCookie(tools.COOK_SEARCH + 'regions', costanti.FILTER_TUTTI),
value: tools.getCookie(tools.COOK_SEARCH + 'regions_fr', costanti.FILTER_TUTTI),
keycookie: '_fr',
addall: true,
arrvalue: [],
filter: null,
@@ -47,7 +48,8 @@ export default defineComponent({
table: 'provinces',
key: 'profile.resid_province',
type: costanti.FieldType.select,
value: tools.getCookie(tools.COOK_SEARCH + 'resid_provinces', costanti.FILTER_TUTTI),
value: tools.getCookie(tools.COOK_SEARCH + 'provinces_fr', costanti.FILTER_TUTTI),
keycookie: '_fr',
addall: true,
arrvalue: [],
filter: getFilterProvinceByRegion,

4
src/views/user/myfriends/myfriends.vue
View File

@@ -25,11 +25,11 @@
nodataLabel=" "
:prop_search="true"
:prop_showfilter="true"
hint="Username o nome da trovare"
hint="Scegli una Regione o Provincia oppure digita il nome o Username"
:finder="true"
:choose_visutype="true"
:finder_noNull="false"
:finder_noNullFilters="false"
:finder_noNullFilters="true"
:options="shared_consts.OPTIONS_SEARCH_USER_ALL_WORDS"
:butt_modif_new="false"
noresultLabel="Username o nome non trovato"