fix(pagination) page=0 resulted in false thx JS

This commit is contained in:
Nicolai Ort 2023-04-18 20:09:44 +02:00
parent f0e20e4130
commit fcee3909f4
Signed by: niggl
GPG Key ID: 13AFA55AF62F269F
14 changed files with 14 additions and 14 deletions

View File

@ -40,7 +40,7 @@ export class DonationController {
let responseDonations: ResponseDonation[] = new Array<ResponseDonation>(); let responseDonations: ResponseDonation[] = new Array<ResponseDonation>();
let donations: Array<Donation>; let donations: Array<Donation>;
if (page) { if (page != undefined) {
donations = await this.donationRepository.find({ relations: ['runner', 'donor', 'runner.scans', 'runner.scans.track'], skip: page * page_size, take: page_size }); donations = await this.donationRepository.find({ relations: ['runner', 'donor', 'runner.scans', 'runner.scans.track'], skip: page * page_size, take: page_size });
} else { } else {
donations = await this.donationRepository.find({ relations: ['runner', 'donor', 'runner.scans', 'runner.scans.track'] }); donations = await this.donationRepository.find({ relations: ['runner', 'donor', 'runner.scans', 'runner.scans.track'] });

View File

@ -29,7 +29,7 @@ export class DonorController {
let responseDonors: ResponseDonor[] = new Array<ResponseDonor>(); let responseDonors: ResponseDonor[] = new Array<ResponseDonor>();
let donors: Array<Donor>; let donors: Array<Donor>;
if (page) { if (page != undefined) {
donors = await this.donorRepository.find({ relations: ['donations', 'donations.runner', 'donations.runner.scans', 'donations.runner.scans.track'], skip: page * page_size, take: page_size }); donors = await this.donorRepository.find({ relations: ['donations', 'donations.runner', 'donations.runner.scans', 'donations.runner.scans.track'], skip: page * page_size, take: page_size });
} else { } else {
donors = await this.donorRepository.find({ relations: ['donations', 'donations.runner', 'donations.runner.scans', 'donations.runner.scans.track'] }); donors = await this.donorRepository.find({ relations: ['donations', 'donations.runner', 'donations.runner.scans', 'donations.runner.scans.track'] });

View File

@ -30,7 +30,7 @@ export class GroupContactController {
let responseContacts: ResponseGroupContact[] = new Array<ResponseGroupContact>(); let responseContacts: ResponseGroupContact[] = new Array<ResponseGroupContact>();
let contacts: Array<GroupContact>; let contacts: Array<GroupContact>;
if (page) { if (page != undefined) {
contacts = await this.contactRepository.find({ relations: ['groups', 'groups.parentGroup'], skip: page * page_size, take: page_size }); contacts = await this.contactRepository.find({ relations: ['groups', 'groups.parentGroup'], skip: page * page_size, take: page_size });
} else { } else {
contacts = await this.contactRepository.find({ relations: ['groups', 'groups.parentGroup'] }); contacts = await this.contactRepository.find({ relations: ['groups', 'groups.parentGroup'] });

View File

@ -31,7 +31,7 @@ export class PermissionController {
let responsePermissions: ResponsePermission[] = new Array<ResponsePermission>(); let responsePermissions: ResponsePermission[] = new Array<ResponsePermission>();
let permissions: Array<Permission>; let permissions: Array<Permission>;
if (page) { if (page != undefined) {
permissions = await this.permissionRepository.find({ relations: ['principal'], skip: page * page_size, take: page_size }); permissions = await this.permissionRepository.find({ relations: ['principal'], skip: page * page_size, take: page_size });
} else { } else {
permissions = await this.permissionRepository.find({ relations: ['principal'] }); permissions = await this.permissionRepository.find({ relations: ['principal'] });

View File

@ -30,7 +30,7 @@ export class RunnerCardController {
let responseCards: ResponseRunnerCard[] = new Array<ResponseRunnerCard>(); let responseCards: ResponseRunnerCard[] = new Array<ResponseRunnerCard>();
let cards: Array<RunnerCard>; let cards: Array<RunnerCard>;
if (page) { if (page != undefined) {
cards = await this.cardRepository.find({ relations: ['runner', 'runner.group', 'runner.group.parentGroup'], skip: page * page_size, take: page_size }); cards = await this.cardRepository.find({ relations: ['runner', 'runner.group', 'runner.group.parentGroup'], skip: page * page_size, take: page_size });
} else { } else {
cards = await this.cardRepository.find({ relations: ['runner', 'runner.group', 'runner.group.parentGroup'] }); cards = await this.cardRepository.find({ relations: ['runner', 'runner.group', 'runner.group.parentGroup'] });

View File

@ -34,7 +34,7 @@ export class RunnerController {
let responseRunners: ResponseRunner[] = new Array<ResponseRunner>(); let responseRunners: ResponseRunner[] = new Array<ResponseRunner>();
let runners: Array<Runner>; let runners: Array<Runner>;
if (page) { if (page != undefined) {
runners = await this.runnerRepository.find({ relations: ['scans', 'group', 'group.parentGroup', 'scans.track'], skip: page * page_size, take: page_size }); runners = await this.runnerRepository.find({ relations: ['scans', 'group', 'group.parentGroup', 'scans.track'], skip: page * page_size, take: page_size });
} else { } else {
runners = await this.runnerRepository.find({ relations: ['scans', 'group', 'group.parentGroup', 'scans.track'] }); runners = await this.runnerRepository.find({ relations: ['scans', 'group', 'group.parentGroup', 'scans.track'] });

View File

@ -33,7 +33,7 @@ export class RunnerOrganizationController {
let responseOrgs: ResponseRunnerOrganization[] = new Array<ResponseRunnerOrganization>(); let responseOrgs: ResponseRunnerOrganization[] = new Array<ResponseRunnerOrganization>();
let orgs: Array<RunnerOrganization>; let orgs: Array<RunnerOrganization>;
if (page) { if (page != undefined) {
orgs = await this.runnerOrganizationRepository.find({ relations: ['contact', 'teams'], skip: page * page_size, take: page_size }); orgs = await this.runnerOrganizationRepository.find({ relations: ['contact', 'teams'], skip: page * page_size, take: page_size });
} else { } else {
orgs = await this.runnerOrganizationRepository.find({ relations: ['contact', 'teams'] }); orgs = await this.runnerOrganizationRepository.find({ relations: ['contact', 'teams'] });

View File

@ -31,7 +31,7 @@ export class RunnerTeamController {
let responseTeams: ResponseRunnerTeam[] = new Array<ResponseRunnerTeam>(); let responseTeams: ResponseRunnerTeam[] = new Array<ResponseRunnerTeam>();
let teams: Array<RunnerTeam>; let teams: Array<RunnerTeam>;
if (page) { if (page != undefined) {
teams = await this.runnerTeamRepository.find({ relations: ['parentGroup', 'contact'], skip: page * page_size, take: page_size }); teams = await this.runnerTeamRepository.find({ relations: ['parentGroup', 'contact'], skip: page * page_size, take: page_size });
} else { } else {
teams = await this.runnerTeamRepository.find({ relations: ['parentGroup', 'contact'] }); teams = await this.runnerTeamRepository.find({ relations: ['parentGroup', 'contact'] });

View File

@ -38,7 +38,7 @@ export class ScanController {
let responseScans: ResponseScan[] = new Array<ResponseScan>(); let responseScans: ResponseScan[] = new Array<ResponseScan>();
let scans: Array<Scan>; let scans: Array<Scan>;
if (page) { if (page != undefined) {
scans = await this.scanRepository.find({ relations: ['runner', 'track'], skip: page * page_size, take: page_size }); scans = await this.scanRepository.find({ relations: ['runner', 'track'], skip: page * page_size, take: page_size });
} else { } else {
scans = await this.scanRepository.find({ relations: ['runner', 'track'] }); scans = await this.scanRepository.find({ relations: ['runner', 'track'] });

View File

@ -30,7 +30,7 @@ export class ScanStationController {
let responseStations: ResponseScanStation[] = new Array<ResponseScanStation>(); let responseStations: ResponseScanStation[] = new Array<ResponseScanStation>();
let stations: Array<ScanStation>; let stations: Array<ScanStation>;
if (page) { if (page != undefined) {
stations = await this.stationRepository.find({ relations: ['track'], skip: page * page_size, take: page_size }); stations = await this.stationRepository.find({ relations: ['track'], skip: page * page_size, take: page_size });
} else { } else {
stations = await this.stationRepository.find({ relations: ['track'] }); stations = await this.stationRepository.find({ relations: ['track'] });

View File

@ -28,7 +28,7 @@ export class StatsClientController {
let responseClients: ResponseStatsClient[] = new Array<ResponseStatsClient>(); let responseClients: ResponseStatsClient[] = new Array<ResponseStatsClient>();
let clients: Array<StatsClient>; let clients: Array<StatsClient>;
if (page) { if (page != undefined) {
clients = await this.clientRepository.find({ skip: page * page_size, take: page_size }); clients = await this.clientRepository.find({ skip: page * page_size, take: page_size });
} else { } else {
clients = await this.clientRepository.find(); clients = await this.clientRepository.find();

View File

@ -29,7 +29,7 @@ export class TrackController {
let responseTracks: ResponseTrack[] = new Array<ResponseTrack>(); let responseTracks: ResponseTrack[] = new Array<ResponseTrack>();
let tracks: Array<Track>; let tracks: Array<Track>;
if (page) { if (page != undefined) {
tracks = await this.trackRepository.find({ skip: page * page_size, take: page_size }); tracks = await this.trackRepository.find({ skip: page * page_size, take: page_size });
} }
else { else {

View File

@ -32,7 +32,7 @@ export class UserController {
let responseUsers: ResponseUser[] = new Array<ResponseUser>(); let responseUsers: ResponseUser[] = new Array<ResponseUser>();
let users: Array<User>; let users: Array<User>;
if (page) { if (page != undefined) {
users = await this.userRepository.find({ relations: ['permissions', 'groups', 'groups.permissions'], skip: page * page_size, take: page_size }); users = await this.userRepository.find({ relations: ['permissions', 'groups', 'groups.permissions'], skip: page * page_size, take: page_size });
} }
else { else {

View File

@ -31,7 +31,7 @@ export class UserGroupController {
let responseGroups: ResponseUserGroup[] = new Array<ResponseUserGroup>(); let responseGroups: ResponseUserGroup[] = new Array<ResponseUserGroup>();
let groups: Array<UserGroup>; let groups: Array<UserGroup>;
if (page) { if (page != undefined) {
groups = await this.userGroupsRepository.find({ relations: ['permissions'], skip: page * page_size, take: page_size }); groups = await this.userGroupsRepository.find({ relations: ['permissions'], skip: page * page_size, take: page_size });
} else { } else {
groups = await this.userGroupsRepository.find({ relations: ['permissions'] }); groups = await this.userGroupsRepository.find({ relations: ['permissions'] });