diff --git a/src/modules/Search/components/search-filter-event/script.js b/src/modules/Search/components/search-filter-event/script.js
index e07f5b9e71..a1d45a0c36 100644
--- a/src/modules/Search/components/search-filter-event/script.js
+++ b/src/modules/Search/components/search-filter-event/script.js
@@ -1,14 +1,14 @@
app.component('search-filter-event', {
template: $TEMPLATES['search-filter-event'],
- setup() {
+ setup() {
// os textos estão localizados no arquivo texts.php deste componente
const text = Utils.getTexts('search-filter-event');
const parseDate = (date) => {
- if(date instanceof Date) {
+ if (date instanceof Date) {
return new Date((new McDate(date)).date('sql') + ' 12:00:00');
} else {
- return new Date(date.substr(0,10) + ' 12:00:00');
+ return new Date(date.substr(0, 10) + ' 12:00:00');
}
}
@@ -19,7 +19,7 @@ app.component('search-filter-event', {
}
const today = parseDate(new Date());
- const nextmonth = parseDate(Dates.addMonths(today,1));
+ const nextmonth = parseDate(Dates.addMonths(today, 1));
const mctoday = new McDate(today);
const mcnextmonth = new McDate(nextmonth);
const startOfWeek = parseDate(Dates.startOfWeek(today));
@@ -29,59 +29,59 @@ app.component('search-filter-event', {
const nextFriday = parseDate(Dates.nextFriday(startOfWeek));
const nextSunday = parseDate(Dates.nextSunday(startOfWeek));
-
+
const ranges = {
- yesterday: {
- label: __('ontem', 'search-filter-event'),
- range: [Dates.subDays(today,1), Dates.subDays(today,1)]
+ yesterday: {
+ label: __('ontem', 'search-filter-event'),
+ range: [Dates.subDays(today, 1), Dates.subDays(today, 1)]
},
- today: {
- label: __('hoje', 'search-filter-event'),
- range: [today, today]
+ today: {
+ label: __('hoje', 'search-filter-event'),
+ range: [today, today]
},
- tomorrow: {
- label: __('amanhã', 'search-filter-event'),
- range: [Dates.addDays(today,1), Dates.addDays(today,1)]
+ tomorrow: {
+ label: __('amanhã', 'search-filter-event'),
+ range: [Dates.addDays(today, 1), Dates.addDays(today, 1)]
},
- lastWeek: {
- label: __('semana passada', 'search-filter-event'),
- range: [Dates.subWeeks(startOfWeek,1), Dates.subWeeks(endOfWeek,1)]
+ lastWeek: {
+ label: __('semana passada', 'search-filter-event'),
+ range: [Dates.subWeeks(startOfWeek, 1), Dates.subWeeks(endOfWeek, 1)]
},
- thisWeek: {
- label: __('esta semana', 'search-filter-event'),
+ thisWeek: {
+ label: __('esta semana', 'search-filter-event'),
range: [startOfWeek, endOfWeek]
},
- nextWeek: {
- label: __('próxima semana', 'search-filter-event'),
- range: [Dates.addWeeks(startOfWeek,1), Dates.addWeeks(endOfWeek,1)]
+ nextWeek: {
+ label: __('próxima semana', 'search-filter-event'),
+ range: [Dates.addWeeks(startOfWeek, 1), Dates.addWeeks(endOfWeek, 1)]
},
- lastWeekend: {
- label: __('fim de semana passado', 'search-filter-event'),
- range: [Dates.subWeeks(nextFriday,1), Dates.subWeeks(nextSunday,1)]
+ lastWeekend: {
+ label: __('fim de semana passado', 'search-filter-event'),
+ range: [Dates.subWeeks(nextFriday, 1), Dates.subWeeks(nextSunday, 1)]
},
- thisWeekend: {
- label: __('este fim de semana', 'search-filter-event'),
+ thisWeekend: {
+ label: __('este fim de semana', 'search-filter-event'),
range: [nextFriday, nextSunday]
},
- nextWeekend: {
- label: __('próximo fim de semana', 'search-filter-event'),
- range: [Dates.addWeeks(nextFriday,1), Dates.addWeeks(nextSunday,1)]
+ nextWeekend: {
+ label: __('próximo fim de semana', 'search-filter-event'),
+ range: [Dates.addWeeks(nextFriday, 1), Dates.addWeeks(nextSunday, 1)]
},
- last7days: {
- label: __('últimos 7 dias', 'search-filter-event'),
- range: [Dates.subDays(today,7), today]
+ last7days: {
+ label: __('últimos 7 dias', 'search-filter-event'),
+ range: [Dates.subDays(today, 7), today]
},
- next7days: {
- label: __('próximos 7 dias', 'search-filter-event'),
- range: [today, Dates.addDays(today,7)]
+ next7days: {
+ label: __('próximos 7 dias', 'search-filter-event'),
+ range: [today, Dates.addDays(today, 7)]
},
- last30days: {
- label: __('últimos 30 dias', 'search-filter-event'),
- range: [Dates.subDays(today,30), today]
+ last30days: {
+ label: __('últimos 30 dias', 'search-filter-event'),
+ range: [Dates.subDays(today, 30), today]
},
- next30days: {
- label: __('próximos 30 dias', 'search-filter-event'),
- range: [today, Dates.addDays(today,30)]
+ next30days: {
+ label: __('próximos 30 dias', 'search-filter-event'),
+ range: [today, Dates.addDays(today, 30)]
},
thisCurrentMonth: {
label: __('este mês', 'search-filter-event'),
@@ -107,8 +107,12 @@ app.component('search-filter-event', {
beforeCreate() {
this.defaultDateFrom = this.parseDate(this.pseudoQuery['@from']);
this.defaultDateTo = this.parseDate(this.pseudoQuery['@to']);
+ this.pseudoQuery['event:name'] = this.pseudoQuery['event:name'] || [];
this.pseudoQuery['event:term:linguagem'] = this.pseudoQuery['event:term:linguagem'] || [];
this.pseudoQuery['event:classificacaoEtaria'] = this.pseudoQuery['event:classificacaoEtaria'] || [];
+ this.pseudoQuery['@seals'] = this.pseudoQuery['@seals'] || [];
+ this.pseudoQuery['En_Estado'] = this.pseudoQuery['En_Estado'] || [];
+ this.pseudoQuery['En_Municipio'] = this.pseudoQuery['En_Municipio'] || [];
},
props: {
@@ -119,12 +123,40 @@ app.component('search-filter-event', {
pseudoQuery: {
type: Object,
required: true
- }
+ },
},
watch: {
+ "pseudoQuery['@seals']": {
+ handler(value) {
+ if (value && value.length > 0) {
+ this.query['@seals'] = value.map(v => v.value || v).join(',');
+ } else {
+ delete this.query['@seals'];
+ }
+ this.$emit('filter-changed', this.query);
+ },
+ deep: true,
+ },
+ "pseudoQuery['En_Estado']": {
+ handler(value) {
+ // this.selectedStates = value;
+ this.filterByState();
+ this.$emit('changeStates', value);
+ },
+ deep: true,
+ },
+ "pseudoQuery['En_Municipio']": {
+ handler(value) {
+ // this.selectedCities = value;
+ this.filterByCities();
+ this.$emit('changeCities', value);
+ },
+ deep: true,
+ },
+
date: {
- handler(date){
+ handler(date) {
if (!date) {
this.date = [this.defaultDateFrom, this.defaultDateTo];
return;
@@ -136,7 +168,29 @@ app.component('search-filter-event', {
this.pseudoQuery['@to'] = d1.date('sql');
},
deep: true,
- }
+ },
+ },
+
+ computed: {
+ states() {
+ return Object.fromEntries(
+ Object.entries(this.statesAndCities).map(([uf, estado]) => [uf, estado.label])
+ );
+ },
+ cities() {
+ const estadosSelecionados = this.pseudoQuery['En_Estado'] || [];
+ let cidades = {};
+
+ estadosSelecionados.forEach(uf => {
+ if (this.statesAndCities[uf]?.cities) {
+ this.statesAndCities[uf].cities.forEach(cidade => {
+ cidades[cidade] = estadosSelecionados.length > 1 ? `${cidade} - ${uf}` : cidade;
+ });
+ }
+ });
+
+ return cidades;
+ },
},
data() {
@@ -153,21 +207,57 @@ app.component('search-filter-event', {
this.ranges.thisYear,
];
+ let query = {
+ '@select': 'id,name,subTitle,files.avatar,seals.name,seals.id,terms,classificacaoEtaria,singleUrl',
+ '@order': 'createTimestamp DESC',
+ '@limit': 20,
+ '@page': 1,
+ }
+
return {
locale: $MAPAS.config.locale,
terms: $TAXONOMIES.linguagem.terms,
+ query,
date: [this.defaultDateFrom, this.defaultDateTo],
presetRanges: presetRanges,
- ageRating: $DESCRIPTIONS.event.classificacaoEtaria.optionsOrder
+ ageRating: $DESCRIPTIONS.event.classificacaoEtaria.optionsOrder,
+ sealsNames: $MAPAS.config.event_filters.seals.map(seal => ({
+ value: seal.id,
+ label: seal.name
+ })),
+ statesAndCities: $MAPAS.config.statesAndCities,
+ selectedStates: [],
+ selectedCities: [],
+ sealsLabels: Object.fromEntries($MAPAS.config.event_filters.seals.map(seal => [seal.id, seal.name])),
}
},
methods: {
+ filterByState() {
+ if (this.selectedStates.length > 0) {
+ this.query['En_Estado'] = `IN(${this.selectedStates.toString()})`;
+ } else {
+ delete this.query['En_Estado'];
+ }
+ this.$emit('filter-changed', this.query);
+ },
+
+ filterByCities() {
+ if (this.selectedCities.length > 0) {
+ this.query['En_Municipio'] = `IN(${this.selectedCities.toString()})`;
+ } else {
+ delete this.query['En_Municipio'];
+ }
+ this.$emit('filter-changed', this.query);
+ },
+
clearFilters() {
+ this.selectedStates = [];
+ this.selectedCities = [];
+
const types = ['string', 'boolean'];
this.date = [this.defaultDateFrom, this.defaultDateTo];
for (const key in this.pseudoQuery) {
- console.log(key+'\n', typeof this.pseudoQuery[key]);
if (['@from', '@to'].includes[key]) {
this.pseudoQuery[key] = new McDate(new Date(key == '@from' ? this.date[0] : this.date[1])).date('sql');
} else {
@@ -177,8 +267,10 @@ app.component('search-filter-event', {
delete this.pseudoQuery[key];
}
}
- }
+ }
+ this.$emit('filter-changed');
},
+
dateFormat(date) {
const d0 = new Date(date[0]);
const d1 = new Date(date[1]);
@@ -188,15 +280,15 @@ app.component('search-filter-event', {
const d1s = mcd1.date('2-digit');
// imprime o ano
- if(this.isFirstDayOfYear(d0) && this.isLastDayOfYear(d1)) {
+ if (this.isFirstDayOfYear(d0) && this.isLastDayOfYear(d1)) {
return mcd0.year();
- // imprime o mês
+ // imprime o mês
} else if (Dates.isFirstDayOfMonth(d0) && Dates.isLastDayOfMonth(d1)) {
const mctoday = new McDate(new Date);
const thisYear = mctoday.year() == mcd0.year();
- if(thisYear) {
+ if (thisYear) {
return Utils.ucfirst(mcd0.month());
} else {
return Utils.ucfirst(mcd0.month()) + ', ' + mcd0.year();
@@ -205,15 +297,15 @@ app.component('search-filter-event', {
// imprime um preset
const rangeString = this.toRangeString(date);
- for(let preset of Object.values(this.ranges)) {
+ for (let preset of Object.values(this.ranges)) {
if (this.toRangeString(preset.range) == rangeString) {
return preset.label;
}
}
// imprime as datas selecionadas
- if(d0s == d1s) {
- return d0s;
+ if (d0s == d1s) {
+ return d0s;
} else {
return `${d0s} - ${d1s}`;
}
@@ -224,15 +316,15 @@ app.component('search-filter-event', {
const d1 = this.parseDate(this.date[1]);
// trocando o ano
- if(this.isFirstDayOfYear(d0) && this.isLastDayOfYear(d1)) {
-
+ if (this.isFirstDayOfYear(d0) && this.isLastDayOfYear(d1)) {
+
const firstDay = Dates.addYears(d0, 1);
this.date = [
firstDay,
Dates.lastDayOfYear(firstDay)
];
- // trocando o mês
+ // trocando o mês
} else if (Dates.isFirstDayOfMonth(d0) && Dates.isLastDayOfMonth(d1)) {
const firstDay = Dates.addMonths(d0, 1);
this.date = [
@@ -240,7 +332,7 @@ app.component('search-filter-event', {
Dates.lastDayOfMonth(firstDay)
];
- // trocando a semana
+ // trocando a semana
} else if (Dates.isSunday(d0) && Dates.isSaturday(d1)) {
const firstDay = Dates.addWeeks(d0, 1);
this.date = [
@@ -248,23 +340,23 @@ app.component('search-filter-event', {
Dates.lastDayOfWeek(firstDay)
];
- // trocando o fim de semana
+ // trocando o fim de semana
} else if (Dates.isFriday(d0) && Dates.isSunday(d1)) {
this.date = [
- Dates.addWeeks(d0,1),
- Dates.addWeeks(d1,1),
+ Dates.addWeeks(d0, 1),
+ Dates.addWeeks(d1, 1),
];
- // trocando o dia
+ // trocando o dia
} else if (Dates.isSameDay(d0, d1)) {
this.date = [
- Dates.addDays(d0,1),
- Dates.addDays(d1,1),
+ Dates.addDays(d0, 1),
+ Dates.addDays(d1, 1),
];
- // outros intervalos
+ // outros intervalos
} else {
- const diff = Dates.differenceInDays(d1,d0);
+ const diff = Dates.differenceInDays(d1, d0);
this.date = [
d1,
Dates.addDays(d1, diff)
@@ -275,16 +367,16 @@ app.component('search-filter-event', {
prevInterval() {
const d0 = this.parseDate(this.date[0]);
const d1 = this.parseDate(this.date[1]);
-
+
// trocando o ano
- if(this.isFirstDayOfYear(d0) && this.isLastDayOfYear(d1)) {
+ if (this.isFirstDayOfYear(d0) && this.isLastDayOfYear(d1)) {
const firstDay = Dates.subYears(d0, 1);
this.date = [
firstDay,
Dates.subDays(d0, 1)
];
-
- // trocando o mês
+
+ // trocando o mês
} else if (Dates.isFirstDayOfMonth(d0) && Dates.isLastDayOfMonth(d1)) {
const firstDay = Dates.subMonths(d0, 1);
this.date = [
@@ -292,32 +384,32 @@ app.component('search-filter-event', {
Dates.subDays(d0, 1)
];
- // trocando a semana
+ // trocando a semana
} else if (Dates.isSunday(d0) && Dates.isSaturday(d1)) {
this.date = [
Dates.subWeeks(d0, 1),
Dates.subWeeks(d1, 1)
];
- // trocando o fim de semana
+ // trocando o fim de semana
} else if (Dates.isFriday(d0) && Dates.isSunday(d1)) {
this.date = [
- Dates.subWeeks(d0,1),
- Dates.subWeeks(d1,1),
+ Dates.subWeeks(d0, 1),
+ Dates.subWeeks(d1, 1),
];
- // trocando o dia
+ // trocando o dia
} else if (Dates.isSameDay(d0, d1)) {
this.date = [
- Dates.subDays(d0,1),
- Dates.subDays(d1,1),
+ Dates.subDays(d0, 1),
+ Dates.subDays(d1, 1),
];
- // outros intervalos
+ // outros intervalos
} else {
- const diff = Dates.differenceInDays(d1,d0);
+ const diff = Dates.differenceInDays(d1, d0);
this.date = [
- Dates.subDays(d0, diff),
+ Dates.subDays(d0, diff),
d0
];
diff --git a/src/modules/Search/components/search-filter-event/template.php b/src/modules/Search/components/search-filter-event/template.php
index 29ff159439..e736126dae 100644
--- a/src/modules/Search/components/search-filter-event/template.php
+++ b/src/modules/Search/components/search-filter-event/template.php
@@ -1,4 +1,5 @@
'id ASC',
+ '@select' => 'id,name,files.avatar',
+];
+$querySeals = new MapasCulturais\ApiQuery(MapasCulturais\Entities\Seal::class, $queryParams);
+
+$this->jsObject['config']['event_filters'] = [
+ 'seals' => $querySeals->getFindResult(),
+];
+
$this->import('
mc-icon
- mc-multiselect
+ mc-currency-input
+ mc-multiselect
mc-tag-list
- search-filter
+ search-filter
');
?>
-
-
diff --git a/src/plugins/MapasBlame b/src/plugins/MapasBlame
index 73062256fa..093fad6fe1 160000
--- a/src/plugins/MapasBlame
+++ b/src/plugins/MapasBlame
@@ -1 +1 @@
-Subproject commit 73062256fa7f1b8c3b5af4b51ba0d95215e93741
+Subproject commit 093fad6fe1fa6b31852556f6367316cfd0191492
diff --git a/src/plugins/MultipleLocalAuth b/src/plugins/MultipleLocalAuth
index 5dfcecb212..d011fad67d 160000
--- a/src/plugins/MultipleLocalAuth
+++ b/src/plugins/MultipleLocalAuth
@@ -1 +1 @@
-Subproject commit 5dfcecb2125a1fde3e60f14b259026ab2db2b4a7
+Subproject commit d011fad67d6dbf4b5b772781254f68f97ab9c256
diff --git a/src/plugins/RecreatePCacheOnLogin b/src/plugins/RecreatePCacheOnLogin
index 1ef9479dee..1069764ea4 160000
--- a/src/plugins/RecreatePCacheOnLogin
+++ b/src/plugins/RecreatePCacheOnLogin
@@ -1 +1 @@
-Subproject commit 1ef9479deecaf864521557174bdd7cc874278c28
+Subproject commit 1069764ea4cbfb30c24ea89840653fb0cb4feccc
diff --git a/src/pnpm-workspace.yaml b/src/pnpm-workspace.yaml
deleted file mode 100644
index 88f2eae04d..0000000000
--- a/src/pnpm-workspace.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-packages:
- - 'modules/*'
- - 'plugins/*'
- - 'themes/*'
- - 'node_scripts'
diff --git a/src/themes/Funarte b/src/themes/Funarte
index 70aaa92f95..97a9fd09fc 160000
--- a/src/themes/Funarte
+++ b/src/themes/Funarte
@@ -1 +1 @@
-Subproject commit 70aaa92f9551a538cf7be5824d5a7fe900faf1cf
+Subproject commit 97a9fd09fc3a5b6edf6201219ea8e67d7710456d