timur.gorodetskiy/request-portal
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: changed SP list order field to StepOrder

Browse Source
This commit is contained in:
Тимур Городецкий
2026-08-04 12:36:40 +05:00
parent c2e785961b
commit ed21944628
17 changed files with 249 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/webparts/requestPortal/forms/RecruitingHire/RecruitingHireForm.tsx
+28 -4
View File
@@ -39,18 +39,27 @@ const RecruitingHireForm: React.FC<IRequestFormProps> = ({ requestType, context,
const approval = useMemo(() => hireApprovalService(), []);
const userEmail = context.pageContext.user.email;
const loadMatrix = useCallback(
() => getPlannedMatrix(context, HIRE_REQUEST_TYPE_ID, userEmail, approval),
() => getPlannedMatrix(context, HIRE_REQUEST_TYPE_ID, userEmail, approval, 'Approval'),
[context, userEmail, approval]
);
const matrix = useMatrixEditor(loadMatrix, userEmail, true, true, (login) =>
approval.getJobTitle(login)
);
// Фаза исполнения: исполнители из маршрута (status='Execution'), только для чтения.
const loadExecutors = useCallback(
() => getPlannedMatrix(context, HIRE_REQUEST_TYPE_ID, userEmail, approval, 'Execution'),
[context, userEmail, approval]
);
const executors = useMatrixEditor(loadExecutors, userEmail, false, true, (login) =>
approval.getJobTitle(login)
);
const saving = actionStatus === 'saving';
const isValid = data.CandidateName.trim().length > 0 && data.Position.trim().length > 0;
const matrixApprovers = (): IApproverToWrite[] =>
matrix.rows.map((r) => ({ email: r.email, position: r.position, allowReassign: r.allowReassign }));
const toApprovers = (rows: typeof matrix.rows): IApproverToWrite[] =>
rows.map((r) => ({ email: r.email, position: r.position, allowReassign: r.allowReassign }));
async function run(kind: ActionKind, requestStatus: string): Promise<void> {
if (!isValid) {
@@ -61,7 +70,12 @@ const RecruitingHireForm: React.FC<IRequestFormProps> = ({ requestType, context,
setActionKind(kind);
setActionStatus('saving');
try {
const id = await saveHireRequest(data, matrixApprovers(), requestStatus);
const id = await saveHireRequest(
data,
toApprovers(matrix.rows),
toApprovers(executors.rows),
requestStatus
);
await uploadAttachments(DATA_LIST_TITLE, id, files); // файлы — после создания элемента
setStatus(requestStatus);
setActionStatus('success');
@@ -115,6 +129,16 @@ const RecruitingHireForm: React.FC<IRequestFormProps> = ({ requestType, context,
<ApprovalMatrix editor={matrix} search={(q) => approval.searchUsers(q)} />
{!executors.loading && executors.rows.length > 0 && (
<ApprovalMatrix
editor={executors}
search={(q) => approval.searchUsers(q)}
title="Исполнение (после согласования)"
roleLabel="Исполнитель"
emptyText="Исполнители не заданы по маршруту."
/>
)}
<FormActions>
<Button variant="secondary" onClick={onCancel} disabled={saving}>
Отмена
src/webparts/requestPortal/forms/RecruitingHire/approval/provisioning.json
+3 -2
View File
@@ -6,7 +6,8 @@
{ "internalName": "Ticket", "title": "Заявка", "type": "Lookup", "lookupList": "Прием на работу — данные", "lookupShowField": "Title" },
{ "internalName": "Date", "title": "Дата", "type": "DateTime" },
{ "internalName": "Comment", "title": "Комментарий", "type": "Note" },
{ "internalName": "Order", "title": "Порядок", "type": "Number" },
{ "internalName": "AllowReassignToOtherApprovers", "title": "Можно перепоручать", "type": "Boolean" }
{ "internalName": "StepOrder", "title": "Порядок", "type": "Number" },
{ "internalName": "AllowReassignToOtherApprovers", "title": "Можно перепоручать", "type": "Boolean" },
{ "internalName": "Phase", "title": "Фаза", "type": "Choice", "choices": ["Согласование", "Исполнение"] }
]
}
src/webparts/requestPortal/forms/RecruitingHire/submit.ts
+5 -3
View File
@@ -1,5 +1,5 @@
import { getSP } from '../../shared/pnp/pnpjs';
import { ApprovalListService, IApproverToWrite, writeApprovers } from '../../shared/approval';
import { ApprovalListService, IApproverToWrite, writeRoute } from '../../shared/approval';
import { IFormData } from './model';
export const DATA_LIST_TITLE = 'Прием на работу — данные';
@@ -40,16 +40,18 @@ async function writeContent(data: IFormData, status: string): Promise<number> {
}
/**
* Сохранить заявку «на прием»: контент + маршрут согласующих со статусом.
* Сохранить заявку «на прием»: контент + маршрут (согласующие + исполнители) со статусом.
* status = «Черновик» (сохранение) или «На согласовании» (отправка).
* executors может быть пустым — тогда после согласования заявка станет «Согласовано».
* Возвращает Id заявки.
*/
export async function saveHireRequest(
data: IFormData,
approvers: IApproverToWrite[],
executors: IApproverToWrite[],
status: string
): Promise<number> {
const id = await writeContent(data, status);
await writeApprovers(hireApprovalService(), id, approvers, status);
await writeRoute(hireApprovalService(), id, approvers, executors, status);
return id;
}
src/webparts/requestPortal/forms/WorkplaceSetup/WorkplaceSetupForm.tsx
+29 -4
View File
@@ -62,16 +62,25 @@ const WorkplaceSetupForm: React.FC<IRequestFormProps> = ({ requestType, context,
const approval = useMemo(() => workplaceApprovalService(), []);
const userEmail = context.pageContext.user.email;
const loadMatrix = useCallback(
() => getPlannedMatrix(context, WORKPLACE_REQUEST_TYPE_ID, userEmail, approval),
() => getPlannedMatrix(context, WORKPLACE_REQUEST_TYPE_ID, userEmail, approval, 'Approval'),
[context, userEmail, approval]
);
const matrix = useMatrixEditor(loadMatrix, userEmail, true, true, (login) => approval.getJobTitle(login));
// Фаза исполнения: исполнители из маршрута (status='Execution'), только для чтения.
const loadExecutors = useCallback(
() => getPlannedMatrix(context, WORKPLACE_REQUEST_TYPE_ID, userEmail, approval, 'Execution'),
[context, userEmail, approval]
);
const executors = useMatrixEditor(loadExecutors, userEmail, false, true, (login) =>
approval.getJobTitle(login)
);
const saving = actionStatus === 'saving';
const isValid = data.FullName.trim().length > 0 && data.Position.trim().length > 0;
const matrixApprovers = (): IApproverToWrite[] =>
matrix.rows.map((r) => ({ email: r.email, position: r.position, allowReassign: r.allowReassign }));
const toApprovers = (rows: typeof matrix.rows): IApproverToWrite[] =>
rows.map((r) => ({ email: r.email, position: r.position, allowReassign: r.allowReassign }));
async function run(kind: ActionKind, requestStatus: string): Promise<void> {
if (!isValid) {
@@ -82,7 +91,13 @@ const WorkplaceSetupForm: React.FC<IRequestFormProps> = ({ requestType, context,
setActionKind(kind);
setActionStatus('saving');
try {
const id = await saveWorkplaceRequest(data, matrixApprovers(), requestStatus, sourceId);
const id = await saveWorkplaceRequest(
data,
toApprovers(matrix.rows),
toApprovers(executors.rows),
requestStatus,
sourceId
);
await uploadAttachments(DATA_LIST_TITLE, id, files);
setActionStatus('success');
if (onSaved) {
@@ -125,6 +140,16 @@ const WorkplaceSetupForm: React.FC<IRequestFormProps> = ({ requestType, context,
<ApprovalMatrix editor={matrix} search={(q) => approval.searchUsers(q)} />
{!executors.loading && executors.rows.length > 0 && (
<ApprovalMatrix
editor={executors}
search={(q) => approval.searchUsers(q)}
title="Исполнение (после согласования)"
roleLabel="Исполнитель"
emptyText="Исполнители не заданы по маршруту."
/>
)}
<FormActions>
<Button variant="secondary" onClick={onCancel} disabled={saving}>
Отмена
src/webparts/requestPortal/forms/WorkplaceSetup/approval/provisioning.json
+3 -2
View File
@@ -6,7 +6,8 @@
{ "internalName": "Ticket", "title": "Заявка", "type": "Lookup", "lookupList": "Организация рабочего места — данные", "lookupShowField": "Title" },
{ "internalName": "Date", "title": "Дата", "type": "DateTime" },
{ "internalName": "Comment", "title": "Комментарий", "type": "Note" },
{ "internalName": "Order", "title": "Порядок", "type": "Number" },
{ "internalName": "AllowReassignToOtherApprovers", "title": "Можно перепоручать", "type": "Boolean" }
{ "internalName": "StepOrder", "title": "Порядок", "type": "Number" },
{ "internalName": "AllowReassignToOtherApprovers", "title": "Можно перепоручать", "type": "Boolean" },
{ "internalName": "Phase", "title": "Фаза", "type": "Choice", "choices": ["Согласование", "Исполнение"] }
]
}
src/webparts/requestPortal/forms/WorkplaceSetup/submit.ts
+5 -3
View File
@@ -1,5 +1,5 @@
import { getSP } from '../../shared/pnp/pnpjs';
import { ApprovalListService, IApproverToWrite, writeApprovers } from '../../shared/approval';
import { ApprovalListService, IApproverToWrite, writeRoute } from '../../shared/approval';
import { IFormData } from './model';
export const DATA_LIST_TITLE = 'Организация рабочего места — данные';
@@ -42,16 +42,18 @@ async function writeContent(data: IFormData, status: string, sourceHireId?: numb
}
/**
* Сохранить заявку «орг. рабочего места»: контент + маршрут согласующих.
* Сохранить заявку «орг. рабочего места»: контент + маршрут (согласующие + исполнители).
* Исполнители пишутся сразу — фаза исполнения стартует автоматически после согласования.
* sourceHireId — если заявка создана на основе «прием».
*/
export async function saveWorkplaceRequest(
data: IFormData,
approvers: IApproverToWrite[],
executors: IApproverToWrite[],
status: string,
sourceHireId?: number
): Promise<number> {
const id = await writeContent(data, status, sourceHireId);
await writeApprovers(workplaceApprovalService(), id, approvers, status);
await writeRoute(workplaceApprovalService(), id, approvers, executors, status);
return id;
}