@topconsultnpm/sdkui-react 6.20.0-dev1.79 → 6.20.0-dev1.80
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/components/features/documents/TMDcmtForm.js +58 -7
- package/lib/helper/index.d.ts +1 -0
- package/lib/helper/index.js +1 -0
- package/lib/helper/workItemsHelper.d.ts +6 -0
- package/lib/helper/workItemsHelper.js +230 -0
- package/lib/services/platform_services.d.ts +1 -1
- package/lib/ts/types.d.ts +5 -2
- package/package.json +2 -2
|
@@ -8,7 +8,7 @@ import { DeviceType, useDeviceType } from '../../base/TMDeviceProvider';
|
|
|
8
8
|
import { useDcmtOperations } from '../../../hooks/useDcmtOperations';
|
|
9
9
|
import { useRelatedDocuments } from '../../../hooks/useRelatedDocuments';
|
|
10
10
|
import { getWorkItemSetIDAsync, handleArchiveVisibility, searchResultToMetadataValues } from '../../../helper/queryHelper';
|
|
11
|
-
import { genUniqueId, IconShow, SDKUI_Localizator, updateMruTids, IconBoard, IconDcmtTypeSys, IconDetailDcmts, IconDownload, calcIsModified, IconMenuVertical, Globalization, getListMaxItems, getSystemMetadata, IconBoxArchiveIn, IconClear, IconUndo, SDKUI_Globals, IconPreview, isTaskMoreInfo, IconWorkflow, IconSearch, deepCompare, IconCheck, IconActivity, TMImageLibrary, IconStar, IconRelation, IconInfo, IconArchiveDoc, IconDelete, IconPair, IconUnpair, IconArchiveMaster, IconArchiveDetail, getExceptionMessage, isApprovalWorkflowView, getDcmtCicoStatus, IconFileDots, IconCustom } from '../../../helper';
|
|
11
|
+
import { genUniqueId, IconShow, SDKUI_Localizator, updateMruTids, IconBoard, IconDcmtTypeSys, IconDetailDcmts, IconDownload, calcIsModified, IconMenuVertical, Globalization, getListMaxItems, getSystemMetadata, IconBoxArchiveIn, IconClear, IconUndo, SDKUI_Globals, IconPreview, isTaskMoreInfo, IconWorkflow, IconSearch, deepCompare, IconCheck, IconActivity, TMImageLibrary, IconStar, IconRelation, IconInfo, IconArchiveDoc, IconDelete, IconPair, IconUnpair, IconArchiveMaster, IconArchiveDetail, getExceptionMessage, isApprovalWorkflowView, getDcmtCicoStatus, IconFileDots, IconCustom, buildWorkItemsFromWFCtrl } from '../../../helper';
|
|
12
12
|
import { hasDetailRelations, hasMasterRelations, isXMLFileExt } from '../../../helper/dcmtsHelper';
|
|
13
13
|
import { Gutters, TMColors } from '../../../utils/theme';
|
|
14
14
|
import { StyledFormButtonsContainer, StyledLoadingContainer, StyledModalContainer, StyledReferenceButton, StyledSpinner, StyledToolbarCardContainer } from '../../base/Styled';
|
|
@@ -112,6 +112,7 @@ const TMDcmtForm = ({ allTasks = [], getAllTasks, deleteTaskByIdsCallback, addTa
|
|
|
112
112
|
const [fetchError, setFetchError] = useState(false);
|
|
113
113
|
const [isWFDataLoading, setIsWFDataLoading] = useState(false);
|
|
114
114
|
const [workItems, setWorkItems] = useState([]);
|
|
115
|
+
const [workItemsForDiagram, setWorkItemsForDiagram] = useState([]);
|
|
115
116
|
const [workflows, setWorkflows] = useState([]);
|
|
116
117
|
const [showCommentForm, setShowCommentForm] = useState(false);
|
|
117
118
|
const [isInitialLoading, setIsInitialLoading] = useState(true);
|
|
@@ -509,7 +510,13 @@ const TMDcmtForm = ({ allTasks = [], getAllTasks, deleteTaskByIdsCallback, addTa
|
|
|
509
510
|
setID = await getWorkItemSetIDAsync(foundItem.tid, foundItem.did);
|
|
510
511
|
}
|
|
511
512
|
// Imposta un singolo work item con il setID caricato
|
|
512
|
-
setWorkItems([{
|
|
513
|
+
setWorkItems([{
|
|
514
|
+
wid: `${foundItem.tid}_${foundItem.did}`,
|
|
515
|
+
tid: foundItem.tid,
|
|
516
|
+
did: foundItem.did,
|
|
517
|
+
setID: setID,
|
|
518
|
+
details: []
|
|
519
|
+
}]);
|
|
513
520
|
// Carica le informazioni complete del workflow
|
|
514
521
|
await loadWorkflowInfo(foundItem.tid);
|
|
515
522
|
}
|
|
@@ -528,14 +535,26 @@ const TMDcmtForm = ({ allTasks = [], getAllTasks, deleteTaskByIdsCallback, addTa
|
|
|
528
535
|
else {
|
|
529
536
|
setID = await getWorkItemSetIDAsync(singleItem.tid, singleItem.did);
|
|
530
537
|
}
|
|
531
|
-
setWorkItems([{
|
|
538
|
+
setWorkItems([{
|
|
539
|
+
wid: `${singleItem.tid}_${singleItem.did}`,
|
|
540
|
+
tid: singleItem.tid,
|
|
541
|
+
did: singleItem.did,
|
|
542
|
+
setID: setID,
|
|
543
|
+
details: []
|
|
544
|
+
}]);
|
|
532
545
|
// Carica le informazioni del workflow
|
|
533
546
|
await loadWorkflowInfo(singleItem.tid);
|
|
534
547
|
}
|
|
535
548
|
else if (itemsByDID.length > 1) {
|
|
536
549
|
// SCENARIO B.2: Più item trovati per lo stesso DID
|
|
537
550
|
// Ambiguità: lo stesso documento appare in più workflow diversi
|
|
538
|
-
const finalWorkItems = itemsByDID.map((item, index) => ({
|
|
551
|
+
const finalWorkItems = itemsByDID.map((item, index) => ({
|
|
552
|
+
wid: `${item.tid}_${item.did}_${index}`,
|
|
553
|
+
tid: item.tid,
|
|
554
|
+
did: item.did,
|
|
555
|
+
setID: undefined,
|
|
556
|
+
details: []
|
|
557
|
+
}));
|
|
539
558
|
setWorkItems(finalWorkItems);
|
|
540
559
|
setWorkflows([]); // Non carichiamo il workflow in caso di ambiguità
|
|
541
560
|
}
|
|
@@ -558,6 +577,38 @@ const TMDcmtForm = ({ allTasks = [], getAllTasks, deleteTaskByIdsCallback, addTa
|
|
|
558
577
|
if (workItemSetIDValue !== undefined || workflowApproveData.length > 0)
|
|
559
578
|
loadAllWfData();
|
|
560
579
|
}, [hasFormData, workItemSetIDValue, workflowApproveData, getWorkItemsByDID, TID, DID, layoutMode, fromDTD?.templateTID, fromDTD?.id]);
|
|
580
|
+
// useEffect per costruire workItemsForDiagram quando l'utente è autorizzato a vedere il diagramma
|
|
581
|
+
useEffect(() => {
|
|
582
|
+
const buildWorkItemsForDiagram = async () => {
|
|
583
|
+
// Verifica se l'utente è autorizzato (ha accesso al diagramma)
|
|
584
|
+
const isAuthorized = !!workflows?.[0]?.diagram;
|
|
585
|
+
if (!isAuthorized || workItems.length === 0) {
|
|
586
|
+
setWorkItemsForDiagram([]);
|
|
587
|
+
return;
|
|
588
|
+
}
|
|
589
|
+
try {
|
|
590
|
+
// Estrai i dati necessari dal primo workItem
|
|
591
|
+
const firstWorkItem = workItems[0];
|
|
592
|
+
// Costruisci WFInstanceDescriptor dai dati disponibili
|
|
593
|
+
const wfInstance = {
|
|
594
|
+
wfid: workflows[0].id,
|
|
595
|
+
tid: TID,
|
|
596
|
+
did: DID,
|
|
597
|
+
instanceId: "", // Puoi adattare questo se hai un instanceId specifico,
|
|
598
|
+
rowIndex: 0,
|
|
599
|
+
values: []
|
|
600
|
+
};
|
|
601
|
+
// Chiama buildWorkItemsFromWFCtrl per ottenere i workItems completi
|
|
602
|
+
const detailedWorkItems = await buildWorkItemsFromWFCtrl(wfInstance);
|
|
603
|
+
setWorkItemsForDiagram(detailedWorkItems);
|
|
604
|
+
}
|
|
605
|
+
catch (error) {
|
|
606
|
+
console.error('Errore durante la costruzione dei work items per il diagramma:', error);
|
|
607
|
+
setWorkItemsForDiagram([]);
|
|
608
|
+
}
|
|
609
|
+
};
|
|
610
|
+
buildWorkItemsForDiagram();
|
|
611
|
+
}, [workflows, workItems]);
|
|
561
612
|
const getSelectionDcmtInfo = useCallback(() => {
|
|
562
613
|
let dcmts = [];
|
|
563
614
|
dcmts.push({ TID: TID ?? 0, DID: DID ?? 0 });
|
|
@@ -583,7 +634,7 @@ const TMDcmtForm = ({ allTasks = [], getAllTasks, deleteTaskByIdsCallback, addTa
|
|
|
583
634
|
const isSysMetadataDisabled = useMemo(() => layoutMode !== LayoutModes.Update, [layoutMode]);
|
|
584
635
|
const isDetailsDisabled = useMemo(() => layoutMode !== LayoutModes.Update || !DID, [layoutMode, DID]);
|
|
585
636
|
const isMasterDisabled = useMemo(() => layoutMode !== LayoutModes.Update || !DID, [layoutMode, DID]);
|
|
586
|
-
const isWFDisabled = useMemo(() => layoutMode !== LayoutModes.Update || fetchError || workItems.length <= 0, [layoutMode, fetchError, workItems.length]);
|
|
637
|
+
const isWFDisabled = useMemo(() => layoutMode !== LayoutModes.Update || fetchError || (workItems.length <= 0 && workItemsForDiagram.length <= 0), [layoutMode, fetchError, workItems.length, workItemsForDiagram.length]);
|
|
587
638
|
const showToppyForApprove = useMemo(() => layoutMode === LayoutModes.Update && !fetchError && workItems.length > 0 && !isOpenDetails && !isOpenMaster, [layoutMode, fetchError, workItems.length, isOpenDetails, isOpenMaster]);
|
|
588
639
|
const showToppyForCompleteMoreInfo = useMemo(() => layoutMode === LayoutModes.Update && !!isTaskMoreInfo(taskMoreInfo?.name) && taskMoreInfo?.state !== Task_States.Completed, [layoutMode, taskMoreInfo?.name, taskMoreInfo?.state]);
|
|
589
640
|
const showToppyForReferences = useMemo(() => allowButtonsRefs && layoutMode === LayoutModes.Update && !!(dcmtReferences && dcmtReferences.length > 0) && !isOpenDetails && !isOpenMaster, [allowButtonsRefs, layoutMode, dcmtReferences, isOpenDetails, isOpenMaster]);
|
|
@@ -1215,7 +1266,7 @@ const TMDcmtForm = ({ allTasks = [], getAllTasks, deleteTaskByIdsCallback, addTa
|
|
|
1215
1266
|
const isAuthorized = !!workflows?.[0]?.diagram;
|
|
1216
1267
|
return (_jsxs("div", { style: { position: 'relative', width: '100%', height: '100%', display: 'flex', flexDirection: 'column', gap: 3 }, children: [workItems.length > 0
|
|
1217
1268
|
? (isAuthorized
|
|
1218
|
-
? _jsx(WFDiagram, { xmlDiagramString: workflows?.[0]?.diagram || '', allowEdit: false, currentSetID: workitemSetID })
|
|
1269
|
+
? _jsx(WFDiagram, { xmlDiagramString: workflows?.[0]?.diagram || '', allowEdit: false, currentSetID: workitemSetID, defaultAutoZoom: true, workitems: workItemsForDiagram })
|
|
1219
1270
|
: _jsx("div", { style: {
|
|
1220
1271
|
position: 'absolute',
|
|
1221
1272
|
top: '50%',
|
|
@@ -1259,7 +1310,7 @@ const TMDcmtForm = ({ allTasks = [], getAllTasks, deleteTaskByIdsCallback, addTa
|
|
|
1259
1310
|
backgroundColor: 'khaki',
|
|
1260
1311
|
borderRadius: 8
|
|
1261
1312
|
}, children: SDKUI_Localizator.WorkItemTechnicalNote_SetID })] }));
|
|
1262
|
-
}, [workflows, formData, workitemSetID, workItems, isWFDataLoading]);
|
|
1313
|
+
}, [workflows, formData, workitemSetID, workItems, workItemsForDiagram, isWFDataLoading, wfError, isMobile]);
|
|
1263
1314
|
const tmDcmtTasks = useMemo(() => {
|
|
1264
1315
|
const isReady = TID && DID && getAllTasks && deleteTaskByIdsCallback && addTaskCallback && editTaskCallback;
|
|
1265
1316
|
if (!isReady) {
|
package/lib/helper/index.d.ts
CHANGED
package/lib/helper/index.js
CHANGED
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { IWorkItemData, WFInstanceDescriptor } from '../ts';
|
|
2
|
+
/**
|
|
3
|
+
* Helper function per costruire IWorkItemData da un WFInstanceDescriptor
|
|
4
|
+
* Effettua le chiamate API necessarie e popola tutti i campi disponibili
|
|
5
|
+
*/
|
|
6
|
+
export declare const buildWorkItemsFromWFCtrl: (wfInstance: WFInstanceDescriptor) => Promise<IWorkItemData[]>;
|
|
@@ -0,0 +1,230 @@
|
|
|
1
|
+
import { SDK_Globals, WorkItemMetadataNames, SystemDataListIDs } from '@topconsultnpm/sdk-ts';
|
|
2
|
+
import { WorkflowCacheService, DataListCacheService, UserListCacheService, DcmtTypeListCacheService } from '@topconsultnpm/sdk-ts';
|
|
3
|
+
import { parseWfDiagramXml } from '../components/features/workflow/diagram/xmlParser';
|
|
4
|
+
/**
|
|
5
|
+
* Helper function per costruire IWorkItemData da un WFInstanceDescriptor
|
|
6
|
+
* Effettua le chiamate API necessarie e popola tutti i campi disponibili
|
|
7
|
+
*/
|
|
8
|
+
export const buildWorkItemsFromWFCtrl = async (wfInstance) => {
|
|
9
|
+
const { wfid, tid: mtid, did: mdid, instanceId } = wfInstance;
|
|
10
|
+
if (!wfid || !mtid || !mdid) {
|
|
11
|
+
return [];
|
|
12
|
+
}
|
|
13
|
+
// Recupera il workflow descriptor
|
|
14
|
+
const workflow = await WorkflowCacheService.GetWFCtrlInfoAsync(wfid);
|
|
15
|
+
// Recupera tutti i work items per questo workflow usando WFCtrl_RetrieveAllWIsAsync
|
|
16
|
+
const workItemsResult = await SDK_Globals.tmSession?.NewWorkflowEngine().WFCtrl_RetrieveAllWIsAsync(wfid, mtid, mdid, instanceId);
|
|
17
|
+
// Se non ci sono work items, restituisci array vuoto
|
|
18
|
+
if (!workItemsResult || workItemsResult.dcmtsFound === 0 || !workItemsResult.dtdResult?.rows) {
|
|
19
|
+
return [];
|
|
20
|
+
}
|
|
21
|
+
// Recupera la DataList degli stati del workflow
|
|
22
|
+
const dldStatus = await DataListCacheService.GetAsync(SystemDataListIDs.WIStates);
|
|
23
|
+
// Parse del diagramma del workflow per ottenere type e name dai diagramItems
|
|
24
|
+
let wfDiagram;
|
|
25
|
+
if (workflow?.diagram) {
|
|
26
|
+
try {
|
|
27
|
+
wfDiagram = parseWfDiagramXml(workflow.diagram);
|
|
28
|
+
}
|
|
29
|
+
catch (error) {
|
|
30
|
+
console.warn('Errore nel parsing del diagramma workflow:', error);
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
// Recupera il DTD per ottenere i MID dai nomi dei metadati
|
|
34
|
+
const dtd = await DcmtTypeListCacheService.GetAsync(workItemsResult.fromTID);
|
|
35
|
+
if (!dtd?.metadata) {
|
|
36
|
+
return [];
|
|
37
|
+
}
|
|
38
|
+
// Crea una mappa nome metadato -> MID
|
|
39
|
+
const metadataNameToMID = {};
|
|
40
|
+
for (const meta of dtd.metadata) {
|
|
41
|
+
if (meta.name) {
|
|
42
|
+
metadataNameToMID[meta.name] = meta.id;
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
const columns = workItemsResult.dtdResult.columns || [];
|
|
46
|
+
// Funzione helper per trovare l'indice di una colonna tramite MID
|
|
47
|
+
const findColumnIndexByMID = (mid) => {
|
|
48
|
+
if (mid === -1)
|
|
49
|
+
return -1;
|
|
50
|
+
return columns.findIndex(col => col.extendedProperties?.MID === mid.toString());
|
|
51
|
+
};
|
|
52
|
+
// Mappa degli indici delle colonne usando MID
|
|
53
|
+
const columnIndices = {
|
|
54
|
+
tid: 0, // TID è sempre il primo
|
|
55
|
+
did: 1, // DID è sempre il secondo
|
|
56
|
+
setID: findColumnIndexByMID(metadataNameToMID[WorkItemMetadataNames.WI_SetID] ?? -1),
|
|
57
|
+
creationTime: findColumnIndexByMID(metadataNameToMID[WorkItemMetadataNames.WI_CreationTime] ?? -1),
|
|
58
|
+
response: findColumnIndexByMID(metadataNameToMID[WorkItemMetadataNames.WI_Response] ?? -1),
|
|
59
|
+
completionTime: findColumnIndexByMID(metadataNameToMID[WorkItemMetadataNames.WI_CompletionTime] ?? -1),
|
|
60
|
+
from: findColumnIndexByMID(metadataNameToMID[WorkItemMetadataNames.WI_From] ?? -1),
|
|
61
|
+
to: findColumnIndexByMID(metadataNameToMID[WorkItemMetadataNames.WI_To] ?? -1),
|
|
62
|
+
or: findColumnIndexByMID(metadataNameToMID[WorkItemMetadataNames.WI_Or] ?? -1),
|
|
63
|
+
status: findColumnIndexByMID(metadataNameToMID[WorkItemMetadataNames.WI_Status] ?? -1),
|
|
64
|
+
category: findColumnIndexByMID(metadataNameToMID[WorkItemMetadataNames.WI_Category] ?? -1),
|
|
65
|
+
description: findColumnIndexByMID(metadataNameToMID[WorkItemMetadataNames.WI_Description] ?? -1),
|
|
66
|
+
setStatus: findColumnIndexByMID(metadataNameToMID[WorkItemMetadataNames.WI_SetStatus] ?? -1),
|
|
67
|
+
setRule: findColumnIndexByMID(metadataNameToMID[WorkItemMetadataNames.WI_SetRule] ?? -1),
|
|
68
|
+
};
|
|
69
|
+
// Crea i WorkItemDetail
|
|
70
|
+
const details = [];
|
|
71
|
+
for (let i = 0; i < workItemsResult.dtdResult.rows.length; i++) {
|
|
72
|
+
const row = workItemsResult.dtdResult.rows[i];
|
|
73
|
+
const tid = Number(row[columnIndices.tid]);
|
|
74
|
+
const did = Number(row[columnIndices.did]);
|
|
75
|
+
const setID = columnIndices.setID !== -1 ? row[columnIndices.setID] : '';
|
|
76
|
+
const toUserID = columnIndices.to !== -1 ? Number(row[columnIndices.to]) : undefined;
|
|
77
|
+
// Risolvi l'utente usando la cache
|
|
78
|
+
let toUser = undefined;
|
|
79
|
+
if (toUserID !== undefined) {
|
|
80
|
+
try {
|
|
81
|
+
toUser = await UserListCacheService.GetAsync(toUserID);
|
|
82
|
+
}
|
|
83
|
+
catch (error) {
|
|
84
|
+
console.warn(`Impossibile recuperare l'utente con ID ${toUserID}:`, error);
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
// Calcola lo status come DataListItemDescriptor
|
|
88
|
+
let statusItem = undefined;
|
|
89
|
+
if (columnIndices.status !== -1) {
|
|
90
|
+
const rawStatusValue = row[columnIndices.status];
|
|
91
|
+
if (rawStatusValue !== undefined && rawStatusValue !== null && dldStatus?.items) {
|
|
92
|
+
statusItem = dldStatus.items.find(item => item.value === rawStatusValue);
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
details.push({
|
|
96
|
+
wid: `${tid}_${did}`,
|
|
97
|
+
tid,
|
|
98
|
+
did,
|
|
99
|
+
wfid: workflow?.id ?? 0,
|
|
100
|
+
approvalVID: workflow?.approvalVID ?? 0,
|
|
101
|
+
setID,
|
|
102
|
+
creationTime: columnIndices.creationTime !== -1 && row[columnIndices.creationTime]
|
|
103
|
+
? new Date(row[columnIndices.creationTime])
|
|
104
|
+
: undefined,
|
|
105
|
+
response: columnIndices.response !== -1 ? row[columnIndices.response] : undefined,
|
|
106
|
+
completionTime: columnIndices.completionTime !== -1 && row[columnIndices.completionTime]
|
|
107
|
+
? new Date(row[columnIndices.completionTime])
|
|
108
|
+
: undefined,
|
|
109
|
+
from: columnIndices.from !== -1 ? Number(row[columnIndices.from]) : undefined,
|
|
110
|
+
to: toUserID,
|
|
111
|
+
toUser: toUser,
|
|
112
|
+
or: columnIndices.or !== -1 ? Number(row[columnIndices.or]) : undefined,
|
|
113
|
+
status: statusItem,
|
|
114
|
+
});
|
|
115
|
+
}
|
|
116
|
+
// Raggruppa per setID considerando il creationTime e setStatus
|
|
117
|
+
// Ordiniamo tutti i details per creationTime (ordine cronologico)
|
|
118
|
+
const sortedAllDetails = [...details].sort((a, b) => {
|
|
119
|
+
if (!a.creationTime || !b.creationTime)
|
|
120
|
+
return 0;
|
|
121
|
+
return a.creationTime.getTime() - b.creationTime.getTime();
|
|
122
|
+
});
|
|
123
|
+
// Crea una mappa detail -> setStatus per avere accesso al setStatus di ogni detail
|
|
124
|
+
const detailSetStatusMap = new Map();
|
|
125
|
+
for (const detail of details) {
|
|
126
|
+
const row = workItemsResult.dtdResult?.rows?.find(r => Number(r[columnIndices.tid]) === detail.tid &&
|
|
127
|
+
Number(r[columnIndices.did]) === detail.did);
|
|
128
|
+
if (row && columnIndices.setStatus !== -1) {
|
|
129
|
+
const setStatusValue = row[columnIndices.setStatus];
|
|
130
|
+
detailSetStatusMap.set(detail, setStatusValue?.toString() ?? '');
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
/**
|
|
134
|
+
* Logica di raggruppamento sequenziale dei workitems:
|
|
135
|
+
*
|
|
136
|
+
* Regole:
|
|
137
|
+
* 1. Primo workitem o SetID diverso => Nuovo step
|
|
138
|
+
* - Se SetStatus = "0" (Nuovo): attiva modalità aggregazione per tutti i successivi
|
|
139
|
+
*
|
|
140
|
+
* 2. Stesso SetID del precedente:
|
|
141
|
+
* - In modalità aggregazione (SetStatus = "0"): aggrega sempre nello stesso step
|
|
142
|
+
* - SetStatus != "0": raggruppa per stesso SetStatus
|
|
143
|
+
* - Stesso SetStatus => aggrega
|
|
144
|
+
* - SetStatus diverso => nuovo step
|
|
145
|
+
* - SetStatus = "0": nuovo step e attiva modalità aggregazione
|
|
146
|
+
*/
|
|
147
|
+
const groups = [];
|
|
148
|
+
let previousSetID = undefined;
|
|
149
|
+
let previousSetStatus = undefined;
|
|
150
|
+
let isInNewStatusMode = false;
|
|
151
|
+
for (const detail of sortedAllDetails) {
|
|
152
|
+
const currentSetStatus = detailSetStatusMap.get(detail) ?? '';
|
|
153
|
+
const currentSetID = detail.setID;
|
|
154
|
+
if (previousSetID === undefined || currentSetID !== previousSetID) {
|
|
155
|
+
// Nuovo SetID: crea nuovo step
|
|
156
|
+
groups.push([detail]);
|
|
157
|
+
previousSetID = currentSetID;
|
|
158
|
+
previousSetStatus = currentSetStatus;
|
|
159
|
+
isInNewStatusMode = currentSetStatus === '0';
|
|
160
|
+
}
|
|
161
|
+
else {
|
|
162
|
+
// Stesso SetID
|
|
163
|
+
if (isInNewStatusMode) {
|
|
164
|
+
// Modalità aggregazione attiva: aggrega sempre
|
|
165
|
+
groups[groups.length - 1].push(detail);
|
|
166
|
+
}
|
|
167
|
+
else {
|
|
168
|
+
if (currentSetStatus === '0') {
|
|
169
|
+
// SetStatus "Nuovo": nuovo step e attiva modalità aggregazione
|
|
170
|
+
groups.push([detail]);
|
|
171
|
+
isInNewStatusMode = true;
|
|
172
|
+
previousSetStatus = currentSetStatus;
|
|
173
|
+
}
|
|
174
|
+
else {
|
|
175
|
+
// SetStatus diverso da "Nuovo": raggruppa per stesso SetStatus
|
|
176
|
+
if (currentSetStatus !== previousSetStatus) {
|
|
177
|
+
groups.push([detail]);
|
|
178
|
+
previousSetStatus = currentSetStatus;
|
|
179
|
+
}
|
|
180
|
+
else {
|
|
181
|
+
groups[groups.length - 1].push(detail);
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
}
|
|
187
|
+
// Crea IWorkItemData per ogni gruppo con tutti i campi disponibili
|
|
188
|
+
const finalWorkItems = groups.map((groupDetails, groupIndex) => {
|
|
189
|
+
const setID = groupDetails[0].setID;
|
|
190
|
+
// Ordina per creationTime (più recente prima)
|
|
191
|
+
const sortedDetails = [...groupDetails].sort((a, b) => {
|
|
192
|
+
if (!a.creationTime || !b.creationTime)
|
|
193
|
+
return 0;
|
|
194
|
+
return b.creationTime.getTime() - a.creationTime.getTime();
|
|
195
|
+
});
|
|
196
|
+
const latest = sortedDetails[0];
|
|
197
|
+
const latestRow = workItemsResult.dtdResult?.rows?.find(row => Number(row[columnIndices.tid]) === latest.tid &&
|
|
198
|
+
Number(row[columnIndices.did]) === latest.did);
|
|
199
|
+
// Calcola il setStatus come DataListItemDescriptor
|
|
200
|
+
let setStatusItem = undefined;
|
|
201
|
+
if (latestRow && columnIndices.setStatus !== -1) {
|
|
202
|
+
const rawStatusValue = latestRow[columnIndices.setStatus];
|
|
203
|
+
if (rawStatusValue !== undefined && rawStatusValue !== null && dldStatus?.items) {
|
|
204
|
+
setStatusItem = dldStatus.items.find(item => item.value === rawStatusValue);
|
|
205
|
+
}
|
|
206
|
+
}
|
|
207
|
+
// Cerca il diagramItem corrispondente al setID nel workflow
|
|
208
|
+
const diagramItem = wfDiagram?.DiagramItems?.find(item => item.ID === setID);
|
|
209
|
+
return {
|
|
210
|
+
wid: `group_${setID}_${groupIndex}`,
|
|
211
|
+
setID,
|
|
212
|
+
creationTime: latest.creationTime,
|
|
213
|
+
groupIndex,
|
|
214
|
+
category: latestRow && columnIndices.category !== -1 ? latestRow[columnIndices.category] : undefined,
|
|
215
|
+
type: diagramItem?.Type,
|
|
216
|
+
name: diagramItem?.ItemName,
|
|
217
|
+
description: latestRow && columnIndices.description !== -1 ? latestRow[columnIndices.description] : undefined,
|
|
218
|
+
setStatus: setStatusItem,
|
|
219
|
+
setRule: latestRow && columnIndices.setRule !== -1 ? Number(latestRow[columnIndices.setRule]) : undefined,
|
|
220
|
+
details: sortedDetails,
|
|
221
|
+
wf: workflow,
|
|
222
|
+
};
|
|
223
|
+
});
|
|
224
|
+
// Ordina i gruppi per creationTime (più recente prima)
|
|
225
|
+
return finalWorkItems.sort((a, b) => {
|
|
226
|
+
if (!a.creationTime || !b.creationTime)
|
|
227
|
+
return 0;
|
|
228
|
+
return b.creationTime.getTime() - a.creationTime.getTime();
|
|
229
|
+
});
|
|
230
|
+
};
|
|
@@ -6,7 +6,7 @@ export declare class PlatformObjectService {
|
|
|
6
6
|
static readonly retrieveAllAdminAsync: (objClass: ObjectClasses, jobType?: JobTypes) => Promise<import("@topconsultnpm/sdk-ts").UserDescriptor[] | DcmtTypeDescriptor[] | import("@topconsultnpm/sdk-ts").AreaDescriptor[] | import("@topconsultnpm/sdk-ts").RelationDescriptor[] | import("@topconsultnpm/sdk-ts").FEDistillerJobDescriptor[] | import("@topconsultnpm/sdk-ts").DataListDescriptor[] | import("@topconsultnpm/sdk-ts").DiskDescriptor[] | import("@topconsultnpm/sdk-ts").GroupDescriptor[] | import("@topconsultnpm/sdk-ts").LDAPDescriptor[] | import("@topconsultnpm/sdk-ts").NumeratorDescriptor[] | ProcessDescriptor[] | import("@topconsultnpm/sdk-ts").SAPLoginDescriptor[] | import("@topconsultnpm/sdk-ts").SignCertDescriptor[] | import("@topconsultnpm/sdk-ts").SignServerDescriptor[] | import("@topconsultnpm/sdk-ts").TreeDescriptor[] | import("@topconsultnpm/sdk-ts").TSADescriptor[] | import("@topconsultnpm/sdk-ts").WFDescriptor[] | undefined>;
|
|
7
7
|
private static readonly loadCacheForJobAsync;
|
|
8
8
|
private static readonly retrieveAdminJobAsync;
|
|
9
|
-
static readonly retrieveAdminAsync: (objClass: ObjectClasses, jobType: JobTypes, id: number) => Promise<import("@topconsultnpm/sdk-ts").UserDescriptor | DcmtTypeDescriptor | import("@topconsultnpm/sdk-ts").MailSenderJobDescriptor | import("@topconsultnpm/sdk-ts").SavedQueryDescriptor | import("@topconsultnpm/sdk-ts").DataListDescriptor | import("@topconsultnpm/sdk-ts").AreaDescriptor | import("@topconsultnpm/sdk-ts").BasketTypeDescriptor | import("@topconsultnpm/sdk-ts").RelationDescriptor | import("@topconsultnpm/sdk-ts").TaskDescriptor | import("@topconsultnpm/sdk-ts").WorkingGroupDescriptor | import("@topconsultnpm/sdk-ts").BarcodeArchiverJobDescriptor | import("@topconsultnpm/sdk-ts").BatchUpdaterJobDescriptor | import("@topconsultnpm/sdk-ts").CassettoDoganaleJobDescriptor | import("@topconsultnpm/sdk-ts").CassettoDoganalePlusJobDescriptor | import("@topconsultnpm/sdk-ts").CassettoFiscaleQueryJobDescriptor | import("@topconsultnpm/sdk-ts").CassettoFiscaleSenderJobDescriptor | import("@topconsultnpm/sdk-ts").CheckSequenceJobDescriptor | import("@topconsultnpm/sdk-ts").COSCheckerJobDescriptor | import("@topconsultnpm/sdk-ts").DcmtConverterJobDescriptor | import("@topconsultnpm/sdk-ts").DcmtDeleterJobDescriptor | import("@topconsultnpm/sdk-ts").DcmtNoteJobDescriptor | import("@topconsultnpm/sdk-ts").DcmtPrinterJobDescriptor | import("@topconsultnpm/sdk-ts").FEAttacherJobDescriptor | import("@topconsultnpm/sdk-ts").FECreatorTxtJobDescriptor | import("@topconsultnpm/sdk-ts").FEDetacherJobDescriptor | import("@topconsultnpm/sdk-ts").FEDistillerJobDescriptor | import("@topconsultnpm/sdk-ts").FESenderWsJobDescriptor | import("@topconsultnpm/sdk-ts").FESplitterJobDescriptor | import("@topconsultnpm/sdk-ts").FEValidatorJobDescriptor | import("@topconsultnpm/sdk-ts").FileArchiverJobDescriptor | import("@topconsultnpm/sdk-ts").FileCheckerJobDescriptor | import("@topconsultnpm/sdk-ts").FileExecJobDescriptor | import("@topconsultnpm/sdk-ts").FileExportJobDescriptor | import("@topconsultnpm/sdk-ts").FileMoverJobDescriptor | import("@topconsultnpm/sdk-ts").LexJobDescriptor | import("@topconsultnpm/sdk-ts").LinkerJobDescriptor | import("@topconsultnpm/sdk-ts").MailArchiverJobDescriptor | import("@topconsultnpm/sdk-ts").MailQueryJobDescriptor | import("@topconsultnpm/sdk-ts").MigrationJobDescriptor | import("@topconsultnpm/sdk-ts").PdDCreatorJobDescriptor | import("@topconsultnpm/sdk-ts").PDFArchiverJobDescriptor | import("@topconsultnpm/sdk-ts").PdVArchiverJobDescriptor | import("@topconsultnpm/sdk-ts").PdVQueryJobDescriptor | import("@topconsultnpm/sdk-ts").PdVSenderJobDescriptor | import("@topconsultnpm/sdk-ts").PeppolQueryJobDescriptor | import("@topconsultnpm/sdk-ts").PeppolSenderJobDescriptor | import("@topconsultnpm/sdk-ts").PostelQueryJobDescriptor | import("@topconsultnpm/sdk-ts").PostelSenderJobDescriptor | import("@topconsultnpm/sdk-ts").ReplicatorJobDescriptor | import("@topconsultnpm/sdk-ts").SAPAlignerJobDescriptor | import("@topconsultnpm/sdk-ts").SAPBarcodeJobDescriptor | import("@topconsultnpm/sdk-ts").SAPDataReaderJobDescriptor | import("@topconsultnpm/sdk-ts").SAPDataWriterJobDescriptor | import("@topconsultnpm/sdk-ts").SignerJobDescriptor | import("@topconsultnpm/sdk-ts").SpoolArchiverJobDescriptor | import("@topconsultnpm/sdk-ts").UpdaterJobDescriptor | import("@topconsultnpm/sdk-ts").DiskDescriptor | import("@topconsultnpm/sdk-ts").GroupDescriptor | import("@topconsultnpm/sdk-ts").LDAPDescriptor | import("@topconsultnpm/sdk-ts").NumeratorDescriptor | ProcessDescriptor | import("@topconsultnpm/sdk-ts").SAPLoginDescriptor | import("@topconsultnpm/sdk-ts").SignCertDescriptor | import("@topconsultnpm/sdk-ts").SignServerDescriptor | import("@topconsultnpm/sdk-ts").TreeDescriptor | import("@topconsultnpm/sdk-ts").TSADescriptor |
|
|
9
|
+
static readonly retrieveAdminAsync: (objClass: ObjectClasses, jobType: JobTypes, id: number) => Promise<import("@topconsultnpm/sdk-ts").UserDescriptor | import("@topconsultnpm/sdk-ts").WFDescriptor | DcmtTypeDescriptor | import("@topconsultnpm/sdk-ts").MailSenderJobDescriptor | import("@topconsultnpm/sdk-ts").SavedQueryDescriptor | import("@topconsultnpm/sdk-ts").DataListDescriptor | import("@topconsultnpm/sdk-ts").AreaDescriptor | import("@topconsultnpm/sdk-ts").BasketTypeDescriptor | import("@topconsultnpm/sdk-ts").RelationDescriptor | import("@topconsultnpm/sdk-ts").TaskDescriptor | import("@topconsultnpm/sdk-ts").WorkingGroupDescriptor | import("@topconsultnpm/sdk-ts").BarcodeArchiverJobDescriptor | import("@topconsultnpm/sdk-ts").BatchUpdaterJobDescriptor | import("@topconsultnpm/sdk-ts").CassettoDoganaleJobDescriptor | import("@topconsultnpm/sdk-ts").CassettoDoganalePlusJobDescriptor | import("@topconsultnpm/sdk-ts").CassettoFiscaleQueryJobDescriptor | import("@topconsultnpm/sdk-ts").CassettoFiscaleSenderJobDescriptor | import("@topconsultnpm/sdk-ts").CheckSequenceJobDescriptor | import("@topconsultnpm/sdk-ts").COSCheckerJobDescriptor | import("@topconsultnpm/sdk-ts").DcmtConverterJobDescriptor | import("@topconsultnpm/sdk-ts").DcmtDeleterJobDescriptor | import("@topconsultnpm/sdk-ts").DcmtNoteJobDescriptor | import("@topconsultnpm/sdk-ts").DcmtPrinterJobDescriptor | import("@topconsultnpm/sdk-ts").FEAttacherJobDescriptor | import("@topconsultnpm/sdk-ts").FECreatorTxtJobDescriptor | import("@topconsultnpm/sdk-ts").FEDetacherJobDescriptor | import("@topconsultnpm/sdk-ts").FEDistillerJobDescriptor | import("@topconsultnpm/sdk-ts").FESenderWsJobDescriptor | import("@topconsultnpm/sdk-ts").FESplitterJobDescriptor | import("@topconsultnpm/sdk-ts").FEValidatorJobDescriptor | import("@topconsultnpm/sdk-ts").FileArchiverJobDescriptor | import("@topconsultnpm/sdk-ts").FileCheckerJobDescriptor | import("@topconsultnpm/sdk-ts").FileExecJobDescriptor | import("@topconsultnpm/sdk-ts").FileExportJobDescriptor | import("@topconsultnpm/sdk-ts").FileMoverJobDescriptor | import("@topconsultnpm/sdk-ts").LexJobDescriptor | import("@topconsultnpm/sdk-ts").LinkerJobDescriptor | import("@topconsultnpm/sdk-ts").MailArchiverJobDescriptor | import("@topconsultnpm/sdk-ts").MailQueryJobDescriptor | import("@topconsultnpm/sdk-ts").MigrationJobDescriptor | import("@topconsultnpm/sdk-ts").PdDCreatorJobDescriptor | import("@topconsultnpm/sdk-ts").PDFArchiverJobDescriptor | import("@topconsultnpm/sdk-ts").PdVArchiverJobDescriptor | import("@topconsultnpm/sdk-ts").PdVQueryJobDescriptor | import("@topconsultnpm/sdk-ts").PdVSenderJobDescriptor | import("@topconsultnpm/sdk-ts").PeppolQueryJobDescriptor | import("@topconsultnpm/sdk-ts").PeppolSenderJobDescriptor | import("@topconsultnpm/sdk-ts").PostelQueryJobDescriptor | import("@topconsultnpm/sdk-ts").PostelSenderJobDescriptor | import("@topconsultnpm/sdk-ts").ReplicatorJobDescriptor | import("@topconsultnpm/sdk-ts").SAPAlignerJobDescriptor | import("@topconsultnpm/sdk-ts").SAPBarcodeJobDescriptor | import("@topconsultnpm/sdk-ts").SAPDataReaderJobDescriptor | import("@topconsultnpm/sdk-ts").SAPDataWriterJobDescriptor | import("@topconsultnpm/sdk-ts").SignerJobDescriptor | import("@topconsultnpm/sdk-ts").SpoolArchiverJobDescriptor | import("@topconsultnpm/sdk-ts").UpdaterJobDescriptor | import("@topconsultnpm/sdk-ts").DiskDescriptor | import("@topconsultnpm/sdk-ts").GroupDescriptor | import("@topconsultnpm/sdk-ts").LDAPDescriptor | import("@topconsultnpm/sdk-ts").NumeratorDescriptor | ProcessDescriptor | import("@topconsultnpm/sdk-ts").SAPLoginDescriptor | import("@topconsultnpm/sdk-ts").SignCertDescriptor | import("@topconsultnpm/sdk-ts").SignServerDescriptor | import("@topconsultnpm/sdk-ts").TreeDescriptor | import("@topconsultnpm/sdk-ts").TSADescriptor | undefined>;
|
|
10
10
|
private static readonly updateJobAsync;
|
|
11
11
|
static readonly updateAsync: (objClass: ObjectClasses, jobType: JobTypes, d: any, ...args: any[]) => Promise<number | undefined>;
|
|
12
12
|
private static readonly createJobAsync;
|
package/lib/ts/types.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ReactNode } from "react";
|
|
2
|
-
import { DataListItemDescriptor, FileFormats, ITopMediaSession, MetadataDescriptor, MetadataValueDescriptor, UserDescriptor, ValidationItem } from "@topconsultnpm/sdk-ts";
|
|
2
|
+
import { DataListItemDescriptor, FileFormats, ITopMediaSession, MetadataDescriptor, MetadataValueDescriptor, UserDescriptor, ValidationItem, WFDescriptor } from "@topconsultnpm/sdk-ts";
|
|
3
3
|
import { ITMEditorBase } from "../components/base/TMEditorBase";
|
|
4
4
|
import { IColumnProps } from "devextreme-react/data-grid";
|
|
5
5
|
export declare enum FormModes {
|
|
@@ -356,14 +356,17 @@ export interface WorkItemDetail {
|
|
|
356
356
|
*/
|
|
357
357
|
export interface IWorkItemData {
|
|
358
358
|
wid: string;
|
|
359
|
+
tid?: number;
|
|
360
|
+
did?: number;
|
|
359
361
|
category?: any;
|
|
360
362
|
type?: any;
|
|
361
363
|
name?: string;
|
|
362
364
|
description?: string;
|
|
363
|
-
setID: string;
|
|
365
|
+
setID: string | undefined;
|
|
364
366
|
creationTime?: Date;
|
|
365
367
|
setStatus?: DataListItemDescriptor;
|
|
366
368
|
setRule?: number;
|
|
367
369
|
details: WorkItemDetail[];
|
|
368
370
|
groupIndex?: number;
|
|
371
|
+
wf?: WFDescriptor;
|
|
369
372
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@topconsultnpm/sdkui-react",
|
|
3
|
-
"version": "6.20.0-dev1.
|
|
3
|
+
"version": "6.20.0-dev1.80",
|
|
4
4
|
"description": "",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"test": "echo \"Error: no test specified\" && exit 1",
|
|
@@ -40,7 +40,7 @@
|
|
|
40
40
|
"lib"
|
|
41
41
|
],
|
|
42
42
|
"dependencies": {
|
|
43
|
-
"@topconsultnpm/sdk-ts": "6.20.0-dev1.
|
|
43
|
+
"@topconsultnpm/sdk-ts": "6.20.0-dev1.6",
|
|
44
44
|
"buffer": "^6.0.3",
|
|
45
45
|
"devextreme": "25.2.4",
|
|
46
46
|
"devextreme-react": "25.2.4",
|