devops/encoach_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into feature/ExamGenRework

Browse Source
This commit is contained in:
Carlos-Mesquita
2024-12-03 12:02:11 +00:00
parent 98ed842932 7801a7d05a
commit ec47d750bf
2 changed files with 32 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/pages/assignments/index.tsx
View File

@@ -50,24 +50,19 @@ export const getServerSideProps = withIronSessionSsr(async ({req, res}) => {
const assignments = const assignments =
await (checkAccess(user, ["developer", "admin"]) ? getAssignments() : getEntitiesAssignments(mapBy(allowedEntities, 'id'))); await (checkAccess(user, ["developer", "admin"]) ? getAssignments() : getEntitiesAssignments(mapBy(allowedEntities, 'id')));
const groups = return { props: serialize({ user, users, entities: allowedEntities, assignments }) };
await (checkAccess(user, ["developer", "admin"]) ? getGroups() : getGroupsByEntities(mapBy(allowedEntities, 'id')));
return {props: serialize({user, users, entities: allowedEntities, assignments, groups})};
}, sessionOptions); }, sessionOptions);
const SEARCH_FIELDS = [["name"]]; const SEARCH_FIELDS = [["name"]];
interface Props { interface Props {
assignments: Assignment[]; assignments: Assignment[];
corporateAssignments?: ({corporate?: CorporateUser} & Assignment)[];
entities: EntityWithRoles[] entities: EntityWithRoles[]
groups: Group[];
user: User; user: User;
users: User[]; users: User[];
} }
export default function AssignmentsPage({assignments, corporateAssignments, entities, user, users, groups}: Props) { export default function AssignmentsPage({ assignments, entities, user, users }: Props) {
const entitiesAllowCreate = useAllowedEntities(user, entities, 'create_assignment') const entitiesAllowCreate = useAllowedEntities(user, entities, 'create_assignment')
const entitiesAllowEdit = useAllowedEntities(user, entities, 'edit_assignment') const entitiesAllowEdit = useAllowedEntities(user, entities, 'edit_assignment')
const entitiesAllowArchive = useAllowedEntities(user, entities, 'archive_assignment') const entitiesAllowArchive = useAllowedEntities(user, entities, 'archive_assignment')

1
src/pages/entities/[id]/roles/[role].tsx
View File

@@ -99,6 +99,7 @@ const ASSIGNMENT_MANAGEMENT: PermissionLayout[] = [
{ label: "View Assignments", key: "view_assignments" }, { label: "View Assignments", key: "view_assignments" },
{ label: "Create Assignments", key: "create_assignment" }, { label: "Create Assignments", key: "create_assignment" },
{ label: "Start Assignments", key: "start_assignment" }, { label: "Start Assignments", key: "start_assignment" },
{ label: "Edit Assignments", key: "edit_assignment" },
{ label: "Delete Assignments", key: "delete_assignment" }, { label: "Delete Assignments", key: "delete_assignment" },
{ label: "Archive Assignments", key: "archive_assignment" }, { label: "Archive Assignments", key: "archive_assignment" },
] ]