Skip to Content
Last modified by Nico Lemaire on 2025/05/06 15:49
From version 21.1
edited by Robin Huisman
on 2024/09/06 11:15
Change comment: There is no comment for this version
To version 15.1
edited by Robin Huisman
on 2024/04/05 16:15
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -3,31 +3,21 @@
3 3  
4 4  = Digital Lab Exchange process =
5 5  
6 -The flow diagram gives a small overview of what the data flow of a lab assignment is.
7 -Every block shows a step of the lab assignment process. From top to bottom these steps are:
6 +The flow diagram gives a small overview of what the data flow of a lab assignment is. Every green block shows a step of the lab assignment process. From top to bottom these steps are:
8 8  
9 9  1. Showing the laboratory and all the analyses that can be requested as an option to the user.
10 10  1. The user creating a lab assignment and sending it to the lab trough TerraIndex.
11 -1. The lab delivering the analysis results back to the TerraIndex.
10 +1. The lab sending the analysis results back to the TerraIndex.
12 12  
13 -[[attach:Lab exchange.svg||rel="noopener noreferrer" target="_blank"]] [[attach:Lab exchange.txt||rel="noopener noreferrer" target="_blank"]]
12 +[[attach:Lab exchange.svg||rel=" noopener noreferrer" target="_blank"]]
14 14  
15 15  [[image:1712326465681-980.png||height="315" width="630"]]
16 16  
17 -
18 18  [[image:1712326492306-381.png||height="781" width="635"]]
19 19  
20 -~==> TODO; add option to confirm order based on the Order price PDF
21 -
22 -
23 23  [[image:1712326520488-924.png||height="312" width="632"]]
24 24  
25 -~==> TODO; add option download labcertificate
26 -
27 27  (% element-id="1884" %)
28 -= =
29 -
30 -(% element-id="1884" %)
31 31  = (% element-id="1883" %)Firewall IP-Addresses of TerraIndex(%%) =
32 32  
33 33  (% element-id="1882" %)
... ... @@ -45,18 +45,10 @@
45 45  Production outbound
46 46  40.115.34.64
47 47  
48 -Production outbound (ftp):
49 -
50 -20.54.163.29, 20.54.163.30, 20.54.163.34, 20.54.163.36, 20.54.163.43, 20.50.134.53, 20.54.163.47, 20.54.163.57, 20.54.163.61, 20.54.163.68, 20.54.163.76, 20.54.163.79, 51.105.111.203, 20.50.147.106, 20.50.148.51, 20.50.148.60, 20.50.146.193, 20.50.148.123, 20.50.148.128, 20.50.148.159, 51.138.21.31, 20.50.148.164, 20.50.148.172, 51.105.105.244, 20.54.163.90, 20.54.163.94, 20.54.163.100, 20.73.28.18, 20.73.28.145, 20.73.29.144, 20.50.2.9
51 -
52 52  (% element-id="1873" %)
53 53  Test outbound
54 54  13.73.138.173
55 55  
56 -Test outbound (ftp):
57 -
58 -51.138.62.216, 51.138.62.232, 51.138.62.241, 51.138.63.1, 51.138.63.19, 51.138.63.30, 51.138.63.43, 51.137.2.110, 51.138.63.49, 51.138.63.70, 51.138.63.82, 51.138.63.94, 51.138.63.102, 51.105.249.46, 51.137.7.98, 51.138.63.17, 51.137.6.51, 51.138.63.159, 51.138.63.175, 51.138.63.189, 51.138.63.234, 20.61.224.11, 20.61.224.20, 20.61.224.37, 20.61.224.50, 52.236.158.189, 52.236.159.215, 52.157.223.174, 52.157.223.203, 40.74.33.17, 20.50.2.44
59 -
60 60  (% element-id="1871" %)
61 61  CD/CI outbound
62 62  40.114.238.16
... ... @@ -113,9 +113,6 @@
113 113  
114 114  (% element-id="1752" %)
115 115  Besides SIKB 13.4.0, TerraIndex also supports 9.0.0/8.0.0 etc.
116 -
117 -(% element-id="1752" %)
118 -~==> nle Do you want to mention these old versions?
119 119  )))|(% element-id="1751" %)
120 120  (% element-id="1749" %)|(% element-id="1748" %)6|(% element-id="1747" %) |(% element-id="1745" %) |(% element-id="1743" %)Reveives a request to create a labdelivery file in a certain version of SIKB. It will generate the file.|(% element-id="1742" %) |(% element-id="1740" %) |(% element-id="1738" %)
121 121  (% element-id="1736" %)|(% element-id="1735" %)7|(% element-id="1734" %) |(% element-id="1732" %)<=|(% element-id="1731" %)Sends back the SIKB file, as a Base64 encoded string, with or without using a zipstream.|(% element-id="1730" %)ResultCode (),
... ... @@ -494,7 +494,7 @@
494 494  
495 495  
496 496  (% element-id="1366" %)
497 -Therefore we call a Webserice for ValidCredentials Check:
476 +Therefor we call a Webserice for ValidCredentials Check:
498 498  
499 499  
500 500  (% class="table-hover" element-id="1363" %)
... ... @@ -713,12 +713,12 @@
713 713  == (% element-id="1202" %)Solution/Design(%%) ==
714 714  
715 715  (% element-id="1201" %)
716 -For this we create a Webservice for CreateOrder to create the order in the lab system.
695 +For this we create a Webserice for CreateOrder to create the order in the lab system.
717 717  After the creation, we would like to show an order overview of the laboratory in the future in PDF. The user can see the prices and can confirm or cancel.
718 718  Depending on the user's choice at the laboratory, to support this or not, TerraIndex calls the ApproveOrder or the CancelOrder.
719 719  
720 720  (% element-id="0" %)
721 -For default we assume that we cannot do this yet, and TerraIndex sends needsApprovaIsSupported = false. If this becomes true in the future, the Lab can indicate whether or not it is necessary in the NeedsApprove field.
700 +For default we assume that we cannot do this yet, and TerraIndex sends needsApprovalIsSupported = false. If this becomes true in the future, the Lab can indicate whether or not it is necessary in the NeedsApprove field.
722 722  
723 723  
724 724  (% class="table-hover" element-id="1195" %)
... ... @@ -1260,20 +1260,11 @@
1260 1260  = (% element-id="653" %)Get Order status and Results(%%) =
1261 1261  
1262 1262  (% element-id="652" %)
1263 -== (% element-id="651" %)Solution/Design(%%) ==
1242 +== (% element-id="651" %)Soluion/Design(%%) ==
1264 1264  
1265 1265  (% element-id="650" %)
1266 1266  TerraIndex will request per license/customer which results are ready. These are queried if the latest changes are newer than the last check. This way we never download too much unnecessarily and it can always be requested again.
1267 -\\Order status we support as minimal:
1268 -3 = Reportnumber is known, no results yet, but it's the official report certificate number.
1269 1269  
1270 -(% element-id="650" %)
1271 -4 = Conceptual, temporary results avaiable, but not final yet. This is optional to send.
1272 -
1273 -(% element-id="650" %)
1274 -5 = Final results are available
1275 -
1276 -
1277 1277  (% class="table-hover" element-id="647" %)
1278 1278  (% element-id="645" %)|(% element-id="644" %)Action|(% element-id="643" %)TerraIndex|(% element-id="642" %) |(% element-id="640" %)Laboratorium|(% element-id="639" %)Parameters/Message|(% element-id="638" %)Remarks|(% element-id="637" %)ResultCodes
1279 1279  (% element-id="636" %)|(% element-id="635" %)1|(% element-id="634" %)Sends a request to the function: GetCustomers().|=(% element-id="633" %)>|(% element-id="632" %) |(% element-id="630" %)WebserviceUsername (string), 
... ... @@ -1280,7 +1280,7 @@
1280 1280  WebservicePassword (string),
1281 1281  CustomerUsername (string)|(% element-id="627" %)We want to skip the Password of the customer, and we introduce the WebserviceUsername + WebservicePassword.|(% element-id="626" %)
1282 1282  (% element-id="624" %)|(% element-id="623" %)2|(% element-id="622" %) |(% element-id="620" %) |(% element-id="618" %)Receives the request and check the customers this username and searches the dateLastChanged for this Customer.|(% element-id="617" %) |(% element-id="615" %) |(% element-id="613" %)
1283 -(% element-id="611" %)|(% element-id="610" %)3|(% element-id="609" %) |(% element-id="607" %)<=|(% element-id="606" %)Sends back the list of customers to check for orderStatuses|(% element-id="605" %)ResultCode (),
1253 +(% element-id="611" %)|(% element-id="610" %)3|(% element-id="609" %) |(% element-id="607" %)<=|(% element-id="606" %)Sends back the list of customers with the lastChangedTimestamp|(% element-id="605" %)ResultCode (),
1284 1284  ErrorMessage (string),
1285 1285  List<customer> , Customer:
1286 1286  CustomerCode (string),
Lab exchange.txt
Author
... ... @@ -1,1 +1,0 @@
1 -XWiki.RobinHuisman
Size
... ... @@ -1,1 +1,0 @@
1 -2.2 KB
Content
... ... @@ -1,50 +1,0 @@
1 -title Digital Lab exchange Process
2 -
3 -participant Lab
4 -participant TerraIndex
5 -participant TerraIndex_User
6 -
7 -
8 -==**Labdelivery data**==
9 -note over Lab,TerraIndex_User:TerraIndex retrieves the 'menu-card' so the user can order analysis.
10 -TerraIndex->Lab:Request the Client codes for a Customer
11 -Lab->TerraIndex:return the active Client codes
12 -TerraIndex->Lab:LabDelivery Data/File for a Customer Client Code
13 -Lab->TerraIndex:return the Labdelivery SIKB0101 File.
14 -TerraIndex->TerraIndex:Store and import into User database.
15 -
16 -==**Labassignment**==
17 -note over Lab,TerraIndex_User:TerraIndex sends the 'order' so the lab can process the samples.
18 -TerraIndex->TerraIndex_User:Show available Lab and Client codes
19 -TerraIndex_User->TerraIndex_User:Select Lab and Client code
20 -TerraIndex->TerraIndex_User:Show available Analysis Sets and Urgencies
21 -TerraIndex_User->TerraIndex_User:Select the samples
22 -TerraIndex_User->TerraIndex_User:Select the needed analysis sets
23 -TerraIndex_User->TerraIndex:Store/Save the labassignment
24 -TerraIndex_User->TerraIndex:Send to the lab
25 -TerraIndex->TerraIndex:Generate SIKB0101 Labassignment file
26 -TerraIndex->Lab:Send file to the Lab
27 -note over Lab,TerraIndex:Option A
28 -Lab->TerraIndex:Acknowledge a success received
29 -TerraIndex->TerraIndex:Save status
30 -TerraIndex->TerraIndex_User:Show status and prevent further editing
31 -note over Lab,TerraIndex:Option B
32 -Lab->TerraIndex:Return Order price PDF
33 -TerraIndex->TerraIndex_User:Show Price and PDF
34 -TerraIndex_User->TerraIndex:Approve Order
35 -TerraIndex->Lab:Approve Order
36 -Lab->TerraIndex:Acknowledge a success received
37 -TerraIndex->TerraIndex:Save status
38 -TerraIndex->TerraIndex_User:Show status and prevent further editing
39 -
40 -==**Labresults**==
41 -note over Lab,TerraIndex_User:TerraIndex retrieves the 'results' so the user can order report.
42 -TerraIndex->Lab:Requests the Changed assignments since last asking
43 -Lab->TerraIndex:return the changed orders with status
44 -TerraIndex->Lab:Request the results of a Ready order
45 -Lab->TerraIndex:return the Analysisresults SIKB0101 File.
46 -TerraIndex->TerraIndex:Store and import into User database.
47 -TerraIndex->TerraIndex_User:
48 -TerraIndex_User->TerraIndex_User:Asessments and Report results
49 -
50 -