finalize ldap
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
This commit is contained in:
parent
0c0515a3c6
commit
856f849526
|
@ -8,19 +8,9 @@ export interface Member {
|
||||||
program: string;
|
program: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
const execPositions: { [name: string]: number } = {
|
|
||||||
president: 1,
|
|
||||||
"vice-president": 2,
|
|
||||||
secretary: 3,
|
|
||||||
treasurer: 4,
|
|
||||||
sysadmin: 5,
|
|
||||||
};
|
|
||||||
|
|
||||||
export async function getMembers(year: string, term: Term): Promise<Member[]> {
|
export async function getMembers(year: string, term: Term): Promise<Member[]> {
|
||||||
if (process.env.USE_LDAP?.toLowerCase() !== "true") {
|
if (process.env.USE_LDAP?.toLowerCase() !== "true") {
|
||||||
return dummyMembers.sort((item1: Member, item2: Member) => {
|
return dummyMembers;
|
||||||
return execPositions[item1.program] - execPositions[item2.program];
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
let members: Member[] = [];
|
let members: Member[] = [];
|
||||||
|
|
||||||
|
@ -43,18 +33,12 @@ export async function getMembers(year: string, term: Term): Promise<Member[]> {
|
||||||
return {
|
return {
|
||||||
name: item.cn as string,
|
name: item.cn as string,
|
||||||
id: item.uid as string,
|
id: item.uid as string,
|
||||||
program:
|
program: item.program === undefined ? "" : (item.program as string),
|
||||||
item.position === undefined
|
|
||||||
? ""
|
|
||||||
: typeof item.position === "string"
|
|
||||||
? item.position
|
|
||||||
: (item.position[0] as string),
|
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
.filter((item: Member) => item.program !== "");
|
.sort((item1: Member, item2: Member) =>
|
||||||
// .sort((item1: Member, item2: Member) => {
|
item1.name.localeCompare(item2.name)
|
||||||
// return execPositions[item1.program] - execPositions[item2.program];
|
);
|
||||||
// });
|
|
||||||
} finally {
|
} finally {
|
||||||
await client.unbind();
|
await client.unbind();
|
||||||
}
|
}
|
||||||
|
@ -64,18 +48,13 @@ export async function getMembers(year: string, term: Term): Promise<Member[]> {
|
||||||
|
|
||||||
const dummyMembers: Member[] = [
|
const dummyMembers: Member[] = [
|
||||||
{
|
{
|
||||||
name: "Alice ",
|
name: "John Smith",
|
||||||
id: "a12smith",
|
id: "j12smith",
|
||||||
program: "sysadmin",
|
program: "MAT/Mathematics Computer Science",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "Jane Smith",
|
name: "Jane Smith",
|
||||||
id: "j34smith",
|
id: "j34smith",
|
||||||
program: "vice-president",
|
program: "MAT/Mathematics Computer Science",
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "John Smith",
|
|
||||||
id: "j12smith",
|
|
||||||
program: "presidentcro",
|
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
Loading…
Reference in New Issue