NoLog.cz/gancio-upstream
6
0
Fork 0
mirror of https://framagit.org/les/gancio.git synced 2025-01-31 16:42:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

feat: improve collections export adding max, start_at parameter

Browse source
This commit is contained in:
lesion 2023-12-15 16:39:56 +01:00
parent 582cef3714
commit c472e87676
No known key found for this signature in database
GPG key ID: 352918250B012177
8 changed files with 15 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets/gancio-events.es.js
View file

@ -462,7 +462,7 @@ function He(t, e, i) {
const h = [];
r && h.push(`max=${r}`);
let p = "/api/events";
o ? p = `/api/collections/${o}` : (f && h.push(`tags=${f}`), s && h.push(`places=${s}`)), h.push(`show_recurrent=${w ? "true" : "false"}`), fetch(`${l}${p}?${h.join("&")}`).then((v) => v.json()).then((v) => {
o ? p = `/feed/json/collection/${o}` : (f && h.push(`tags=${f}`), s && h.push(`places=${s}`)), h.push(`show_recurrent=${w ? "true" : "false"}`), fetch(`${l}${p}?${h.join("&")}`).then((v) => v.json()).then((v) => {
i(5, E = v.events || v);
}).catch((v) => {
console.error("Error loading Gancio API -> ", v);

1
components/Search.vue
View file

@ -101,7 +101,6 @@ export default {
},
search: debounce(async function(search) {
this.items = await this.$axios.$get(`/event/meta?search=${search.target.value}`)
console.error('items ', this.items.length)
}, 100),
remove (item) {
// const filters = {

2
docs/assets/js/gancio-events.es.js
View file

@ -462,7 +462,7 @@ function He(t, e, i) {
const h = [];
r && h.push(`max=${r}`);
let p = "/api/events";
o ? p = `/api/collections/${o}` : (f && h.push(`tags=${f}`), s && h.push(`places=${s}`)), h.push(`show_recurrent=${w ? "true" : "false"}`), fetch(`${l}${p}?${h.join("&")}`).then((v) => v.json()).then((v) => {
o ? p = `/feed/json/collection/${o}` : (f && h.push(`tags=${f}`), s && h.push(`places=${s}`)), h.push(`show_recurrent=${w ? "true" : "false"}`), fetch(`${l}${p}?${h.join("&")}`).then((v) => v.json()).then((v) => {
i(5, E = v.events || v);
}).catch((v) => {
console.error("Error loading Gancio API -> ", v);

23
server/api/controller/collection.js
View file

@ -42,20 +42,13 @@ const collectionController = {
async getEvents (req, res) {
const name = req.params.name
const format = req.params.format || 'json'
const max = req.query.max || 10
const start_at = req.query.start_at || DateTime.local().toUnixInteger()
try {
const events = await collectionController._getEvents(name)
switch (format) {
case 'rss':
return exportController.feed(req, res, events,
`${res.locals.settings.title} - Collection @${name}`,
`${res.locals.settings.baseurl}/feed/rss/collection/${name}`)
case 'ics':
return exportController.ics(req, res, events)
default:
const events = await collectionController._getEvents({ name, start_at, max })
log.debug(`[COLLECTION] (${name}) events: ${events?.length}`)
return res.json(events)
}
} catch (e) {
log.error(e)
return res.sendStatus(404)
@ -63,7 +56,7 @@ const collectionController = {
},
// return events from collection
async _getEvents (name) {
async _getEvents ({ name, start_at, max = 10 }) {
const collection = await Collection.findOne({ where: { name } })
if (!collection) {
@ -74,7 +67,7 @@ const collectionController = {
if (!filters.length) {
return []
}
const start = DateTime.local().toUnixInteger()
const where = {
// do not include parent recurrent event
recurrent: null,
@ -82,7 +75,7 @@ const collectionController = {
// confirmed event only
is_visible: true,
start_datetime: { [Op.gte]: start },
start_datetime: { [Op.gte]: start_at },
}
const replacements = []
@ -118,7 +111,7 @@ const collectionController = {
},
{ model: Place, required: true, attributes: ['id', 'name', 'address'] }
],
// limit: max,
limit: max,
replacements
}).catch(e => {
log.error('[EVENT]', e)

3
server/api/controller/export.js
View file

@ -49,8 +49,7 @@ const exportController = {
let events = []
if (collection) {
events = await collectionController._getEvents(collection)
console.error(events.map(e => e))
events = await collectionController._getEvents({ name: collection })
} else {
events = await Event.findAll({
order: ['start_datetime'],

2
static/gancio-events.es.js
View file

@ -462,7 +462,7 @@ function He(t, e, i) {
const h = [];
r && h.push(`max=${r}`);
let p = "/api/events";
o ? p = `/api/collections/${o}` : (f && h.push(`tags=${f}`), s && h.push(`places=${s}`)), h.push(`show_recurrent=${w ? "true" : "false"}`), fetch(`${l}${p}?${h.join("&")}`).then((v) => v.json()).then((v) => {
o ? p = `/feed/json/collection/${o}` : (f && h.push(`tags=${f}`), s && h.push(`places=${s}`)), h.push(`show_recurrent=${w ? "true" : "false"}`), fetch(`${l}${p}?${h.join("&")}`).then((v) => v.json()).then((v) => {
i(5, E = v.events || v);
}).catch((v) => {
console.error("Error loading Gancio API -> ", v);

2
webcomponents/src/GancioEvents.svelte
View file

@ -27,7 +27,7 @@
let api = '/api/events'
if (collection) {
api = `/api/collections/${collection}`
api = `/feed/json/collection/${collection}`
} else {
if (tags) {
params.push(`tags=${tags}`)

2
wp-plugin/js/gancio-events.es.js
View file

@ -462,7 +462,7 @@ function He(t, e, i) {
const h = [];
r && h.push(`max=${r}`);
let p = "/api/events";
o ? p = `/api/collections/${o}` : (f && h.push(`tags=${f}`), s && h.push(`places=${s}`)), h.push(`show_recurrent=${w ? "true" : "false"}`), fetch(`${l}${p}?${h.join("&")}`).then((v) => v.json()).then((v) => {
o ? p = `/feed/json/collection/${o}` : (f && h.push(`tags=${f}`), s && h.push(`places=${s}`)), h.push(`show_recurrent=${w ? "true" : "false"}`), fetch(`${l}${p}?${h.join("&")}`).then((v) => v.json()).then((v) => {
i(5, E = v.events || v);
}).catch((v) => {
console.error("Error loading Gancio API -> ", v);