Merge pull request 'Migrate visits view' (!135) from wbuezas/hedera-web-mindshore:feature/visits-view into beta
gitea/hedera-web/pipeline/head This commit looks good
Details
gitea/hedera-web/pipeline/head This commit looks good
Details
Reviewed-on: #135 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
This commit is contained in:
commit
efa49fccdd
|
@ -10,7 +10,7 @@ import { useAppStore } from 'stores/app';
|
||||||
import { storeToRefs } from 'pinia';
|
import { storeToRefs } from 'pinia';
|
||||||
|
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const jApi = inject('jApi');
|
const api = inject('api');
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const appStore = useAppStore();
|
const appStore = useAppStore();
|
||||||
|
@ -24,28 +24,21 @@ const visitsData = ref(null);
|
||||||
const getVisits = async () => {
|
const getVisits = async () => {
|
||||||
try {
|
try {
|
||||||
loading.value = true;
|
loading.value = true;
|
||||||
const [visitsResponse] = await jApi.query(
|
|
||||||
`SELECT browser,
|
const { data } = await api.get('visitUsers/getVisits', {
|
||||||
MIN(CAST(version AS DECIMAL(4,1))) minVersion,
|
params: {
|
||||||
MAX(CAST(version AS DECIMAL(4,1))) maxVersion,
|
|
||||||
MAX(c.stamp) lastVisit,
|
|
||||||
COUNT(DISTINCT c.id) visits,
|
|
||||||
SUM(a.firstAccessFk = c.id AND v.firstAgentFk = a.id) newVisits
|
|
||||||
FROM visitUser e
|
|
||||||
JOIN visitAccess c ON c.id = e.accessFk
|
|
||||||
JOIN visitAgent a ON a.id = c.agentFk
|
|
||||||
JOIN visit v ON v.id = a.visitFk
|
|
||||||
WHERE c.stamp BETWEEN TIMESTAMP(#from,'00:00:00') AND TIMESTAMP(#to,'23:59:59')
|
|
||||||
GROUP BY browser ORDER BY visits DESC`,
|
|
||||||
{
|
|
||||||
from: date(from.value),
|
from: date(from.value),
|
||||||
to: date(to.value)
|
to: date(to.value)
|
||||||
}
|
}
|
||||||
);
|
});
|
||||||
visitsData.value = visitsResponse;
|
|
||||||
loading.value = false;
|
if (!data || !data.length) return;
|
||||||
|
|
||||||
|
visitsData.value = data[0];
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Error getting visits:', error);
|
console.error('Error getting visits:', error);
|
||||||
|
} finally {
|
||||||
|
loading.value = false;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue