ETA/WebETA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes: pagination & users permissions

Browse Source
This commit is contained in:
Alexandro Uc Santos
2024-03-13 21:39:26 -06:00
parent cbd076e887
commit c286da773e
18 changed files with 92 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/views/LoadsPublishedView.vue
View File

@@ -13,18 +13,18 @@
const loading = ref(false);
const query = ref('');
const filterQuery = ref([]);
const limit = 3;
const limit = 5;
onMounted(() =>{
console.log('init')
getDataLoadsInit(false);
})
///loads?company=64fa70c130d2650011ac4f3a&$limit=3&$skip=0&status[$ne]=Closed&$sort%5BcreatedAt%5D=-1
///loads?company=64fa70c130d2650011ac4f3a&elements=3&page=0&status[$ne]=Closed&$sort%5BcreatedAt%5D=-1
watch(query, () => {
filterQuery.value.skip = "$skip="+ 0;
filterQuery.value.limit = "$limit="+ 100;
filterQuery.value.page = "page="+ 0;
filterQuery.value.limit = "elements="+ 100;
if(query.value.length === 0){
console.log('Clear manueal')
// console.log(loadStore.loadsTotal)
@@ -35,8 +35,8 @@
});
const getDataLoadsInit = async(reload) => {
filterQuery.value.limit = '$limit=' + limit;
filterQuery.value.skip = "$skip=0"
filterQuery.value.limit = 'elements=' + limit;
filterQuery.value.page = "page=0"
filterQuery.value.status = "status[$ne]="+"Closed";
loading.value = true;
await loadStore.getCompanyLoads(filterQuery.value, reload);
@@ -46,7 +46,7 @@
const getLoadsByPage = async(data) => {
console.log(data);
loading.value = true;
filterQuery.value.skip = "$skip="+ data.skip;
filterQuery.value.page = "page="+ data.page;
loadStore.loadsCurrentPage = data.page
await loadStore.getCompanyLoads(filterQuery.value, true)
loading.value = false;
@@ -82,9 +82,9 @@
}
const clearRequest = () => {
filterQuery.value.skip = "$skip="+ 0;
filterQuery.value.limit = "$limit="+ limit;
loadStore.loadsCurrentPage = 1;
filterQuery.value.page = "page="+ 0;
filterQuery.value.limit = "elements="+ limit;
loadStore.loadsCurrentPage = 0;
}
const loadHistory = () => {

16
src/views/LocationsView.vue
View File

@@ -19,12 +19,14 @@
getInitData();
})
const limit = 3;
const limit = 5;
const getInitData = async() => {
loading.value = true;
// companyStore.locationsCurrentPage = companyStore.locationsCurrentPage;
filterQuery.value.company = "company="+ localStorage.getItem('id');
filterQuery.value.limit = "elements=" + limit;
filterQuery.value.page = "page=" + 0;
await companyStore.getLocationsCompany(filterQuery.value, false)
loading.value = false;
}
@@ -32,7 +34,7 @@
const getLocationsByPage = async(data) => {
loading.value = true;
filterQuery.value.company = "company="+ localStorage.getItem('id');
filterQuery.value.skip = "$skip="+ data.skip;
filterQuery.value.page = "page=" + data.page;
companyStore.locationsCurrentPage = data.page
await companyStore.getLocationsCompany(filterQuery.value, true)
loading.value = false;
@@ -45,8 +47,8 @@
}
watch(query, () => {
filterQuery.value.skip = "$skip="+ 0;
filterQuery.value.limit = "$limit="+ 100;
filterQuery.value.page = "page=" + 0;
filterQuery.value.limit = "elements=" + 100;
if(query.value.length === 0){
clearRequest();
filterQuery.value.search = "";
@@ -77,9 +79,9 @@
}
const clearRequest = () => {
filterQuery.value.skip = "$skip="+ 0;
filterQuery.value.limit = "$limit="+ limit;
companyStore.locationsCurrentPage = 1;
filterQuery.value.page = "page=" + 0;
filterQuery.value.limit = "elements="+ limit;
companyStore.locationsCurrentPage = 0;
}
const handleSetCurrentLocation = (location) => {

1
src/views/MyCompanyView.vue
View File

@@ -44,6 +44,7 @@ import { storeToRefs } from 'pinia';
<div class="header-info">
<h2>{{ company.company?.company_name }}</h2>
<button
v-if="auth.user?.job_role === 'owner'"
class="btn-primary-sm"
data-toggle="modal" data-target="#editcompanymodal"
><i class="fa-solid fa-pen-to-square"></i> Editar empresa</button>

7
src/views/TrucksPublishedView.vue
View File

@@ -12,7 +12,7 @@
const proposalCurrent = ref(null);
const openModal = ref(false);
const openModalProposal = ref(false);
const limit = 3;
const limit = 5;
onMounted(() =>{
getInitData();
@@ -20,15 +20,14 @@
const getInitData = async() => {
loading.value = true;
const filter = '$limit=' + limit + "&$skip=0";
const filter = 'elements=' + limit + "&page=0";
await companyStore.getProposalsCompany(filter, false);
loading.value = false;
}
const getProposalsByPage = async(data) => {
console.log(data)
loading.value = true;
const filter = '$limit=' + limit + "&$skip=" + data.skip;
const filter = 'elements=' + limit + "&page=" + data.page;
companyStore.proposalsCurrentPage = data.page;
await companyStore.getProposalsCompany(filter, true);
loading.value = false;

3
src/views/UsersView.vue
View File

@@ -24,10 +24,9 @@
}
const getUsersByPage = async(data) => {
console.log(data)
loading.value = true;
companyStore.usersCurrentPage = data.page
await companyStore.getUsersCompany(limit, data.skip, true);
await companyStore.getUsersCompany(limit, companyStore.usersCurrentPage, true);
loading.value = false;
}

16
src/views/VehiclesView.vue
View File

@@ -29,8 +29,8 @@
const getInitData = async() => {
loading.value = true;
filterQuery.value.limit = '$limit=' + limit;
filterQuery.value.skip = "$skip=0"
filterQuery.value.limit = 'elements=' + limit;
filterQuery.value.page = "page=0"
filterQuery.value.company = "company="+ localStorage.getItem('id');
await vehicleStore.fetchVehicles(filterQuery.value, false);
await companyStore.getDrivers();
@@ -44,8 +44,8 @@
}
watch(query, () => {
filterQuery.value.skip = "$skip="+ 0;
filterQuery.value.limit = "$limit="+ 100;
filterQuery.value.page = "page="+ 0;
filterQuery.value.limit = "elements="+ 100;
if(query.value.length === 0){
clearRequest()
filterQuery.value.search = "";
@@ -75,9 +75,9 @@
}
const clearRequest = () => {
filterQuery.value.skip = "$skip="+ 0;
filterQuery.value.limit = "$limit="+ limit;
vehicleStore.vehiclesCurrentPage = 1;
filterQuery.value.page = "page="+ 0;
filterQuery.value.limit = "elements="+ limit;
vehicleStore.vehiclesCurrentPage = 0;
}
const handleSetCurrentVehicle = (data) => {
@@ -102,7 +102,7 @@
const getVehiclesByPage = async(data) => {
loading.value = true;
filterQuery.value.company = "company="+ localStorage.getItem('id');
filterQuery.value.skip = "$skip="+ data.skip;
filterQuery.value.page = "page="+ data.page;
vehicleStore.vehiclesCurrentPage = data.page
await vehicleStore.fetchVehicles(filterQuery.value, true);
loading.value = false;