3421 template_creaPatientsSystem

[creaMiniTools.git] / appli / template_creaPatientsSystem / scripts / Report.bbs

diff --git a/appli/template_creaPatientsSystem/scripts/Report.bbs b/appli/template_creaPatientsSystem/scripts/Report.bbs
index ecae2f8fd560bd3dd2a1e86b4af3432cfee9245e..2293b0d8c175784d64fc57634f1b7c9a0017d286 100644 (file)
--- a/appli/template_creaPatientsSystem/scripts/Report.bbs
+++ b/appli/template_creaPatientsSystem/scripts/Report.bbs
@@ -47,9 +47,8 @@ new std:ConcatStrings Box13
 new wx:OutputText Box14
 
 new creaMiniTools:CreateReport01 Box15
-  set Box15.LstPatientsID "P01 P02 P03"
-  set Box15.LstTitles1 "+            Step01         Step02     Step03  Step04       Step05     Step06  General    Scientific  Informatic"
-  set Box15.LstTitles2 "Patient Insert_Data InitValues Filter      Correction Validation PushDB Comment Comment Comment"
+  set Box15.LstTitles1 "+            Step01         Step02                Step03  Step04       Step05     Step06  General    Scientific  Informatic"
+  set Box15.LstTitles2 "Patient Insert_Data InitialParameters  Filter      Correction Validation PushDB Comment Comment Comment"
 
 new wx:ListCtrl Box17
 
@@ -76,44 +75,42 @@ new std:ReplaceString Box24
 new std:ConcatStrings Box25
   set Box25.In3 "/Step01_Insert_Data.txt  "
 
-new std:ConcatStrings Box26
-  set Box26.In2 "/results"
-
 new std:ConcatStrings Box27
-  set Box27.In3 "/Step002.txt  "
+  set Box27.In3 "/Step02_InitialParameters.txt  "
 
 new std:ConcatStrings Box28
-  set Box28.In3 "/Step03.txt  "
+  set Box28.In3 "/Step03_Filter.txt  "
 
 new std:ConcatStrings Box29
 
 new std:ConcatStrings Box30
-  set Box30.In3 "/Comments_General.txt  "
+  set Box30.In3 "/Comment-General.txt  "
 
 new std:ConcatStrings Box31
-  set Box31.In3 "/Comments_Informatic.txt  "
+  set Box31.In3 "/Comment-Informatic.txt  "
 
 new std:ConcatStrings Box32
-  set Box32.In3 "/Comments_Scientific.txt  "
+  set Box32.In3 "/Comment-Scientific.txt  "
 
 new std:ConcatStrings Box33
 
 new std:ConcatStrings Box34
-  set Box34.In3 "/Step04.txt  "
+  set Box34.In3 "/Step04_Correction.txt  "
 
 new std:ConcatStrings Box35
-  set Box35.In3 "/Step05.txt  "
+  set Box35.In3 "/Step05_Validation.txt  "
 
 new std:ConcatStrings Box36
-  set Box36.In3 "/Step06.txt  "
+  set Box36.In3 "/Step06_PushDB.txt  "
 
 new std:ReplaceString Box38
   set Box38.Search "<PATIENT>/Condition_01"
 
-new wx:OutputText Box39
-
 new std:ConcatStrings Box40
 
+new std:FilesFromDirectory Box43
+  set Box43.Type "1"
+
 
 
 connect Box04.Widget Box06.Widget1
@@ -157,12 +154,6 @@ connect Box13.Out Box25.In1
 
 connect Box22.Out Box25.In2
 
-connect Box13.Out Box26.In1
-
-connect Box21.Out Box26.In3
-
-connect Box26.Out Box04.In
-
 connect Box23.Out Box27.In2
 
 connect Box13.Out Box27.In1
@@ -239,14 +230,20 @@ connect Box13.Out Box36.In1
 
 connect Box22.Out Box38.In
 
-connect Box38.Out Box39.In
+connect Box40.Out Box43.In
+
+connect Box43.OutSimple Box15.LstPatientsID
 
-connect Box39.Widget Box06.Widget5
+connect Box40.Out Box04.In
 
-connect Box03.Out Box40.In1
+connect Box13.Out Box40.In1
 
 connect Box38.Out Box40.In2
 
+connect Box05.BoxChange Box17.BoxExecute
+
+connect Box05.BoxChange Box15.BoxExecute
+
 
 
 # Complex input ports