diff --git a/src/service/club/calendarService.ts b/src/service/club/calendarService.ts index 0714cd3..e1186a1 100644 --- a/src/service/club/calendarService.ts +++ b/src/service/club/calendarService.ts @@ -12,6 +12,7 @@ export default abstract class CalendarService { .getRepository(calendar) .createQueryBuilder("calendar") .leftJoinAndSelect("calendar.type", "type") + .orderBy("starttime", "ASC") .getMany() .then((res) => { return res; diff --git a/src/service/club/member/communicationService.ts b/src/service/club/member/communicationService.ts index f0c2f04..5ca7bdd 100644 --- a/src/service/club/member/communicationService.ts +++ b/src/service/club/member/communicationService.ts @@ -16,6 +16,7 @@ export default abstract class CommunicationService { .leftJoinAndSelect("communication.member", "member") .leftJoinAndSelect("member.sendNewsletter", "sendNewsletter") .where("communication.memberId = :memberId", { memberId: memberId }) + .orderBy("communicationType.type", "ASC") .getMany() .then((res) => { return res; diff --git a/src/service/club/member/memberAwardService.ts b/src/service/club/member/memberAwardService.ts index 16ed55c..db69f06 100644 --- a/src/service/club/member/memberAwardService.ts +++ b/src/service/club/member/memberAwardService.ts @@ -14,6 +14,7 @@ export default abstract class MemberAwardService { .createQueryBuilder("memberAwards") .leftJoinAndSelect("memberAwards.award", "award") .where("memberAwards.memberId = :memberId", { memberId: memberId }) + .orderBy("award.award", "ASC") .getMany() .then((res) => { return res; diff --git a/src/service/club/member/memberExecutivePositionService.ts b/src/service/club/member/memberExecutivePositionService.ts index 89cf23c..ff15ba0 100644 --- a/src/service/club/member/memberExecutivePositionService.ts +++ b/src/service/club/member/memberExecutivePositionService.ts @@ -14,6 +14,8 @@ export default abstract class MemberExecutivePositionService { .createQueryBuilder("memberExecutivePositions") .leftJoinAndSelect("memberExecutivePositions.executivePosition", "executivePosition") .where("memberExecutivePositions.memberId = :memberId", { memberId: memberId }) + .orderBy("executivePosition.position", "ASC") + .addOrderBy("memberExecutivePositions.start", "DESC") .getMany() .then((res) => { return res; diff --git a/src/service/club/member/memberQualificationService.ts b/src/service/club/member/memberQualificationService.ts index 9685c19..84c6a5f 100644 --- a/src/service/club/member/memberQualificationService.ts +++ b/src/service/club/member/memberQualificationService.ts @@ -14,6 +14,7 @@ export default abstract class MemberQualificationService { .createQueryBuilder("memberQualifications") .leftJoinAndSelect("memberQualifications.qualification", "qualification") .where("memberQualifications.memberId = :memberId", { memberId: memberId }) + .orderBy("qualification.qualification", "ASC") .getMany() .then((res) => { return res; diff --git a/src/service/settings/awardService.ts b/src/service/settings/awardService.ts index 414ea01..57872da 100644 --- a/src/service/settings/awardService.ts +++ b/src/service/settings/awardService.ts @@ -12,6 +12,7 @@ export default abstract class AwardService { return await dataSource .getRepository(award) .createQueryBuilder("award") + .orderBy("award", "ASC") .getMany() .then((res) => { return res; diff --git a/src/service/settings/calendarTypeService.ts b/src/service/settings/calendarTypeService.ts index 0bbc5bb..1fb3f34 100644 --- a/src/service/settings/calendarTypeService.ts +++ b/src/service/settings/calendarTypeService.ts @@ -11,6 +11,7 @@ export default abstract class CalendarTypeService { return await dataSource .getRepository(calendarType) .createQueryBuilder("calendarType") + .orderBy("type", "ASC") .getMany() .then((res) => { return res; diff --git a/src/service/settings/communicationTypeService.ts b/src/service/settings/communicationTypeService.ts index cecc1fc..74494b1 100644 --- a/src/service/settings/communicationTypeService.ts +++ b/src/service/settings/communicationTypeService.ts @@ -11,6 +11,7 @@ export default abstract class CommunicationTypeService { return await dataSource .getRepository(communicationType) .createQueryBuilder("communicationType") + .orderBy("type", "ASC") .getMany() .then((res) => { return res; diff --git a/src/service/settings/executivePositionService.ts b/src/service/settings/executivePositionService.ts index e69e96f..cf2b105 100644 --- a/src/service/settings/executivePositionService.ts +++ b/src/service/settings/executivePositionService.ts @@ -12,6 +12,7 @@ export default abstract class ExecutivePositionService { return await dataSource .getRepository(executivePosition) .createQueryBuilder("executivePosition") + .orderBy("position", "ASC") .getMany() .then((res) => { return res; diff --git a/src/service/settings/membershipStatusService.ts b/src/service/settings/membershipStatusService.ts index 23269f1..b1e94f1 100644 --- a/src/service/settings/membershipStatusService.ts +++ b/src/service/settings/membershipStatusService.ts @@ -12,6 +12,7 @@ export default abstract class MembershipStatusService { return await dataSource .getRepository(membershipStatus) .createQueryBuilder("membershipStatus") + .orderBy("status", "ASC") .getMany() .then((res) => { return res; diff --git a/src/service/settings/newsletterConfigService.ts b/src/service/settings/newsletterConfigService.ts index 5ef66a3..984fbb2 100644 --- a/src/service/settings/newsletterConfigService.ts +++ b/src/service/settings/newsletterConfigService.ts @@ -13,6 +13,7 @@ export default abstract class NewsletterConfigService { .getRepository(newsletterConfig) .createQueryBuilder("newsletterConfig") .leftJoinAndSelect("newsletterConfig.comType", "comType") + .orderBy("comType.type", "ASC") .getMany() .then((res) => { return res; diff --git a/src/service/settings/qualification.ts b/src/service/settings/qualification.ts index 585d1ae..f400576 100644 --- a/src/service/settings/qualification.ts +++ b/src/service/settings/qualification.ts @@ -13,6 +13,7 @@ export default abstract class QualificationService { return await dataSource .getRepository(qualification) .createQueryBuilder("qualification") + .orderBy("qualification", "ASC") .getMany() .then((res) => { return res; diff --git a/src/service/settings/queryStoreService.ts b/src/service/settings/queryStoreService.ts index 8dfbcf8..8ad5a52 100644 --- a/src/service/settings/queryStoreService.ts +++ b/src/service/settings/queryStoreService.ts @@ -11,6 +11,7 @@ export default abstract class QueryStoreService { return await dataSource .getRepository(query) .createQueryBuilder("queryStore") + .orderBy("title", "ASC") .getMany() .then((res) => { return res; diff --git a/src/service/settings/templateService.ts b/src/service/settings/templateService.ts index 4ace459..fb073f8 100644 --- a/src/service/settings/templateService.ts +++ b/src/service/settings/templateService.ts @@ -12,6 +12,7 @@ export default abstract class TemplateService { return await dataSource .getRepository(template) .createQueryBuilder("template") + .orderBy("template", "ASC") .getMany() .then((res) => { return res; diff --git a/src/service/settings/templateUsageService.ts b/src/service/settings/templateUsageService.ts index e944edc..a782d7b 100644 --- a/src/service/settings/templateUsageService.ts +++ b/src/service/settings/templateUsageService.ts @@ -14,6 +14,7 @@ export default abstract class TemplateUsageService { .leftJoinAndSelect("templateUsage.header", "headerTemplate") .leftJoinAndSelect("templateUsage.body", "bodyTemplate") .leftJoinAndSelect("templateUsage.footer", "footerTemplate") + .orderBy("scope", "ASC") .getMany() .then((res) => { return res; diff --git a/src/service/user/roleService.ts b/src/service/user/roleService.ts index 82cdaae..042c001 100644 --- a/src/service/user/roleService.ts +++ b/src/service/user/roleService.ts @@ -12,6 +12,7 @@ export default abstract class RoleService { .getRepository(role) .createQueryBuilder("role") .leftJoinAndSelect("role.permissions", "role_permissions") + .orderBy("role", "ASC") .getMany() .then((res) => { return res; diff --git a/src/service/user/userService.ts b/src/service/user/userService.ts index 2ff9ed1..45102a5 100644 --- a/src/service/user/userService.ts +++ b/src/service/user/userService.ts @@ -15,6 +15,8 @@ export default abstract class UserService { .leftJoinAndSelect("user.roles", "roles") .leftJoinAndSelect("user.permissions", "permissions") .leftJoinAndSelect("roles.permissions", "role_permissions") + .orderBy("firstname", "ASC") + .addOrderBy("lastname", "ASC") .getMany() .then((res) => { return res;