From 14f9ce0ebcf79c07fda2abf7d3abd797abacd946 Mon Sep 17 00:00:00 2001 From: Pit Buttchereit <116184086+PitButtchereit@users.noreply.github.com> Date: Tue, 21 May 2024 12:17:23 +0200 Subject: [PATCH 01/34] =?UTF-8?q?=F0=9F=90=9B=20fix=20cohort=20database=20?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tracex_project/db.sqlite3 | Bin 356352 -> 356352 bytes .../extraction/logic/orchestrator.py | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/tracex_project/db.sqlite3 b/tracex_project/db.sqlite3 index 3cd604e19d54b8c5b39440fe90c83349715804a7..05bbbe18ab862746706f807b1f9e137c37d7c152 100644 GIT binary patch delta 1769 zcmai!UrbYX6vyxHcW+xDZEpo?6~s}36M@ouZ~t+t6H6&ANGYXIz{J(k-a=dYhqh4K z%m_thCYWfNc^?)NvIn;Z$za{Q^JN*?(;nQS#$?G%B-^rV*)rLD*b?Km+p1X<6Ccj+ z_q``4=bqp1e12zsOFq9PzgWAALl9(yw;|pz-mYD0)d)DGE%E+_e-%et&|F?5b7AOh zG*|G-8c}(FivUrMn3%a#!s|-~V^M;jH2IC{LpF-6Cn+PTHIhUdq1VxRYO+~~C>P3~ z52ic`CK8)vJigduERpg|Fi}5~c=nZK=JL+!DrMB~iNq2NMNnE5p;JAdo1n<{!jbAs z4c3g(fK@KS-DsPOJ64zE}MzX!)4<{AfNB6Pf zBii*^LRV;reP3UO;(ze>hqw#ki@)HqYF-*E_~ode0>6h;<^`+DGRXvPldMQq3MBDB zoUdE!ZEQsCAf53W{D}~m&<6ZILv$t*Vsz6`CkHqWI?hZF5>Y8WPi-TT6_^EMGBe*ORuH8<5NtjL8S#8X4@Cxtx`_> zEUX6=!lbbHL&TI~-&%qP*;7k!FX&*iORyUl+07-`TAe%nG@Cq^VK9Kjv0N3eR4QJvtK;ARXyP``!@q$s*YGsLS1K^d zq&=ShiS`uHW?t%SD%QWBUG@So`|CJpW3gq}Ej*qQDm*khzXbP`jtMRi1_wDZ6qMZk~~;%J{pe=N!qBdqcf_F0kP4k(!6DC($?CCNTrQK<;;L^7 z`i=E8yZI%y@4yfbWW&kRr%#ID3!_I@oUj^-q;v$gW*4~N^)2)VY5l7j!cG^^sx#(E zXWBYyh$gM}q{HMk5#hL-IAPH1`e#yIsesBuPo;y}gv*^AaFLTIqL#st_?)W0y-(}1 z4ch{CzuucYPR#_h*^HYS>{O8%Z#=`0?E|zU6B^4H{3GKbSIpAe69_vs-G;8Yu}C@{ zPo;ES?umi!NVv}tO*?zzb9%GeHq>iL_*C|2x4C^ll?^zo$!Ek2$1=n5H0hviR^O;5 o8SCjB?{ph9{mks>jK-aCoXE~ihXSh5plkT$#1seG)l&l5f6fB`;{X5v delta 2878 zcmbVOYit`?6}~gJ>m*7%c{y$3hE7-ZCfVAKAF-WDo3_r&PGaXBrwM}W*mLbnIuB=N z{Hl=LO&eA~D{Yl!{bPk%X{FtjAgh$X4*dbz{(}7ht0EO4fuN%7YC%BDE2}UF7uxilItnY@zKOT!oaWBWpF6*dwQRb(PhcIJW8L4!y1wiB(fMM) z<3c}ckamwP%r7urzv%WQVVs+qbuSjIb8~V$4B?n(8gd^w(pr+Rn3u~qn_wx#MLVEUEmq3HwD`)cDI?59~nYmq}$!+^7naN zPQTafb5rWm&#-#W#X1yawdn>R{zQC0{E&EyxJ49*1Q9jeAnv2_@&6eAMA<}4r8nQv z-7hvfst{Q_FoQuc%Q6l(#nT*YwjU;KIa8Ll?&~JuuJ#LuX*YKrCav!*OF@~V2RXEK zQ~?ZFEM{N{3V9YPg}s}`-T1twe;Um}QAlKDnH7cC9_iZDwu|^5yC*2%j4?eNt+S53ji?0CX;L;!zl$)&e0qv=2#(x4#5`aI&%ih z3#dSz+^aDB9kx+rO!PgqdWj^0D@dXToE~vfoUi(P)I-oeF?d{E(0*C zkgQA=nTlId5s{(-CA5zrsjNT}=II1d;y3}yG8w036o4q~LadM!C7xDLeaN(=y-UbA z$vI>s7x=Uy@-pI*6A~LoHnarEEG@CxQeeo0nBf>Q4oOyE*vSMU$wE?0l03?tO>+<_ zAV8y*on$#mmQRb4LJNu(B!U%I$UrhDN|#YR$OI?KkSmZmR#_>f-`BMjkyZvJETu#; znUPQ~5(%?3m)Q+i-i<O=7F+kemq>w!sJt>n8|mQMPA0j`p2gim z`S!q9Q88@glZ+1X!D<13=YaOA!Wkh&OD&&!RrnV{e>-R`{g%Q{6f5bKy9u(iYaOZe z88Pb6?Y4dKL2ngH?2}!ehwcvS7e@r!&M^RB_cWjTsUX4ISbw|2Tn^D%iKTM4lV$g) z4lngPwHCFWD{a4{Q;SUwt$U!vE2>(ln(T)N&1cHO{fx?4G`(<$Zd2DGLZY)Q+>g4g z!)PzJ(nC6F!}FRp>ZAu6=~diP{Wn9vU^Cci*LUdp_wds1*Ktd&@i;|c8#aZGb8z>s zykxzGw_w)N*=zWNV=1k5Nh)z2C$Sm^=H)exRf6f#S2pmD(u*5-D`qQQ*}zAzK2~lQL{$;#Y*T@@>2Ljl&#q}n% zayZbcbSIA4u(K+%`Ui$Jl^<;y$%iNH4p}1!yn-Hc`vCxRH zn^X{I? zr^&Pb<$+@X3m)OXP zqR=iT7MP7iXO=?Yu-`iunN3mhWMRb{k1s8{6z{^4tQ2!G$OJR_fRO9;j`t*Ui5Oh= zE~KWT`T6kN`1r`Uj~`9(bVeB%pUGrGi%X-aOS#E8Nf{jo4GqA&Z#tTT9(rW3cdC~X zC%n5Qo0jB0F%d}jjBqJ&f}Ui#+|*h)k_!!w(F2q8a5PA{mQ%ho&7I2ABfX0UYla8{ zeXd@o-_z^$1m1nB!*;)XbUGf?&K|4L@ukye@gJx^d#Zm6S9!1gTX^+%&Q~7;-u7RH z)Kh-_U+~Jls;Bg~E9ce3 diff --git a/tracex_project/extraction/logic/orchestrator.py b/tracex_project/extraction/logic/orchestrator.py index 5faa46a5..1cb1ab2f 100644 --- a/tracex_project/extraction/logic/orchestrator.py +++ b/tracex_project/extraction/logic/orchestrator.py @@ -243,7 +243,7 @@ def set_default_values(self): if "cohort_tagging" not in config_modules: cohort_default_values = { "age": None, - "gender": None, + "sex": None, "origin": None, "condition": None, "preexisting_condition": None, From e6edf62193a3be68f698934bf017c2d3a4e9d271 Mon Sep 17 00:00:00 2001 From: Pit Buttchereit <116184086+PitButtchereit@users.noreply.github.com> Date: Tue, 21 May 2024 12:28:01 +0200 Subject: [PATCH 02/34] =?UTF-8?q?=F0=9F=92=8E=20remove=20print=20in=20pj?= =?UTF-8?q?=20generator?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tracex_project/patient_journey_generator/generator.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/tracex_project/patient_journey_generator/generator.py b/tracex_project/patient_journey_generator/generator.py index 0f3d1837..e8b5cbd9 100644 --- a/tracex_project/patient_journey_generator/generator.py +++ b/tracex_project/patient_journey_generator/generator.py @@ -9,9 +9,6 @@ def generate_patient_journey(): """Creates a new patient journey with the help of the GPT engine.""" - print( - "Please wait while the system is generating a patient journey. This may take a few moments." - ) messages = Prompt.objects.get(name="CREATE_PATIENT_JOURNEY").text messages.insert(0, {"role": "system", "content": create_patient_journey_context()}) patient_journey = u.query_gpt(messages=messages, temperature=1) From ae1a6fa10097d274e84df5a58cec11e72dbd2239 Mon Sep 17 00:00:00 2001 From: Pit Buttchereit <116184086+PitButtchereit@users.noreply.github.com> Date: Tue, 21 May 2024 14:37:44 +0200 Subject: [PATCH 03/34] =?UTF-8?q?=F0=9F=92=8E=20add=20function=20button?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/db_results_overview.html | 2 +- .../db_results/templates/evaluation.html | 2 +- .../templates/metrics_dashboard.html | 2 +- .../templates/metrics_pj_overview.html | 2 +- .../templates/choose_input_method.html | 2 +- .../extraction/templates/filter_journey.html | 4 +- .../extraction/templates/journey_details.html | 4 +- .../extraction/templates/result.html | 10 +- .../extraction/templates/save_success.html | 2 +- .../extraction/templates/select_journey.html | 2 +- .../extraction/templates/upload_journey.html | 4 +- .../templates/journey_generation.html | 2 +- .../templates/journey_generator_overview.html | 8 +- .../templates/testing_comparison.html | 2 +- .../templates/testing_overview.html | 2 +- .../templates/testing_result.html | 2 +- .../tracex/static/tracex/css/new_styles.css | 503 ++++++++++++++++++ .../tracex/templates/error_page.html | 2 +- .../tracex/templates/landing_page.html | 10 +- tracex_project/tracex/views.py | 2 + 20 files changed, 537 insertions(+), 32 deletions(-) create mode 100644 tracex_project/tracex/static/tracex/css/new_styles.css diff --git a/tracex_project/db_results/templates/db_results_overview.html b/tracex_project/db_results/templates/db_results_overview.html index f34e30e4..4c049651 100644 --- a/tracex_project/db_results/templates/db_results_overview.html +++ b/tracex_project/db_results/templates/db_results_overview.html @@ -3,7 +3,7 @@ Database Results {% load static %} - + diff --git a/tracex_project/db_results/templates/evaluation.html b/tracex_project/db_results/templates/evaluation.html index 46469867..74359ea3 100644 --- a/tracex_project/db_results/templates/evaluation.html +++ b/tracex_project/db_results/templates/evaluation.html @@ -6,7 +6,7 @@ Evaluation View - + diff --git a/tracex_project/db_results/templates/metrics_dashboard.html b/tracex_project/db_results/templates/metrics_dashboard.html index 293568ed..ba3c6c49 100644 --- a/tracex_project/db_results/templates/metrics_dashboard.html +++ b/tracex_project/db_results/templates/metrics_dashboard.html @@ -3,7 +3,7 @@ Metrics Dashboard {% load static %} - + diff --git a/tracex_project/db_results/templates/metrics_pj_overview.html b/tracex_project/db_results/templates/metrics_pj_overview.html index 87ed02d3..669216d3 100644 --- a/tracex_project/db_results/templates/metrics_pj_overview.html +++ b/tracex_project/db_results/templates/metrics_pj_overview.html @@ -3,7 +3,7 @@ Metrics Overview {% load static %} - + diff --git a/tracex_project/extraction/templates/choose_input_method.html b/tracex_project/extraction/templates/choose_input_method.html index 06477b76..586f99d5 100644 --- a/tracex_project/extraction/templates/choose_input_method.html +++ b/tracex_project/extraction/templates/choose_input_method.html @@ -4,7 +4,7 @@ Choose Input Method {% load static %} - + diff --git a/tracex_project/extraction/templates/filter_journey.html b/tracex_project/extraction/templates/filter_journey.html index 7cbf8250..8ee3881c 100644 --- a/tracex_project/extraction/templates/filter_journey.html +++ b/tracex_project/extraction/templates/filter_journey.html @@ -3,7 +3,7 @@ Upload Journey {% load static %} - + @@ -331,7 +331,7 @@

DFG activity key

- + diff --git a/tracex_project/extraction/templates/journey_details.html b/tracex_project/extraction/templates/journey_details.html index 6c0e334a..0b8195a0 100644 --- a/tracex_project/extraction/templates/journey_details.html +++ b/tracex_project/extraction/templates/journey_details.html @@ -4,7 +4,7 @@ Select Journey {% load static %} - + @@ -14,7 +14,7 @@

Content of "{{ patient_journey.name }}"

{% csrf_token %} - +
diff --git a/tracex_project/extraction/templates/result.html b/tracex_project/extraction/templates/result.html index 5679c435..47a5d761 100644 --- a/tracex_project/extraction/templates/result.html +++ b/tracex_project/extraction/templates/result.html @@ -5,7 +5,7 @@ Result {% load static %} - + @@ -28,7 +28,7 @@

Success! The TracEX pipeline produced the following results:

{% if trace_table %} - + diff --git a/tracex_project/trace_comparator/templates/testing_overview.html b/tracex_project/trace_comparator/templates/testing_overview.html index c1ef0f4f..1e61fc0c 100644 --- a/tracex_project/trace_comparator/templates/testing_overview.html +++ b/tracex_project/trace_comparator/templates/testing_overview.html @@ -14,11 +14,11 @@

Welcome to the Trace Testing Environment

{% csrf_token %} {{ form.as_p }} - +
- + diff --git a/tracex_project/trace_comparator/templates/testing_result.html b/tracex_project/trace_comparator/templates/testing_result.html index cb5278ef..466ff583 100644 --- a/tracex_project/trace_comparator/templates/testing_result.html +++ b/tracex_project/trace_comparator/templates/testing_result.html @@ -49,13 +49,15 @@

Number of
Wrong Orders

- + - + @@ -63,7 +65,7 @@

Number of
Wrong Orders

- + From 0ac55c4fbd8a6094a66a9354616f8dc6bdbcec46 Mon Sep 17 00:00:00 2001 From: Pit Buttchereit <116184086+PitButtchereit@users.noreply.github.com> Date: Fri, 24 May 2024 14:04:10 +0200 Subject: [PATCH 31/34] =?UTF-8?q?=F0=9F=92=8E=20update=20tracex=20template?= =?UTF-8?q?s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tracex_project/tracex/templates/error_page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tracex_project/tracex/templates/error_page.html b/tracex_project/tracex/templates/error_page.html index 863a9b25..4cc56aa5 100644 --- a/tracex_project/tracex/templates/error_page.html +++ b/tracex_project/tracex/templates/error_page.html @@ -21,7 +21,7 @@

{{ type }}

- + \ No newline at end of file From ce6e8f5659575d4b375aa5ad797a95073fb2775b Mon Sep 17 00:00:00 2001 From: Pit Buttchereit <116184086+PitButtchereit@users.noreply.github.com> Date: Sat, 25 May 2024 18:30:56 +0200 Subject: [PATCH 32/34] =?UTF-8?q?=F0=9F=90=9B=20fix=20cohort=20prompt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tracex_project/db.sqlite3 | Bin 360448 -> 360448 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/tracex_project/db.sqlite3 b/tracex_project/db.sqlite3 index beddcb41abb82233822101433e648da8d68e77fe..5bedc0f89dec1975325bd82c5c3c8044a0e5d880 100644 GIT binary patch delta 635 zcmZo@5Nl`rV!~qD321&gd~}Z8p?@U@vH@U}#}wWNBq&u4ig)XlQA+ zStD9=tu9 z4Gm84sHiaeGFn)q8D=My7H^hW`{EO`7Dv={ z_63akOdL_$%@!~!aj>&7GcvI=YHd$k!MKLEBm=()6Mi!t!5$(Y?EZc)^ST`~= zOR~P1&hEf!$i(^v7)YB~nNypzrhE9ZhCqVd*ucujK+nR^#MIbmdx#tB22KGsP7Vg1 ziQG9{dVIHdw{da+wasGQzAl(GidCaYS)A3kIncdcLb$vWJQuz(?9vHkaF7FHer DBxSw8 delta 4827 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 V4>!(x`Si0R0_epSh3+$n{{s!GSDXL< From 77a4ed983a82ba5a9f8bbc2c7cbfd2bd13f2a355 Mon Sep 17 00:00:00 2001 From: Pit Buttchereit <116184086+PitButtchereit@users.noreply.github.com> Date: Sun, 26 May 2024 11:48:47 +0200 Subject: [PATCH 33/34] =?UTF-8?q?=F0=9F=90=9B=20apply=20suggested=20change?= =?UTF-8?q?s=20from=20@Nils?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tracex_project/extraction/logic/orchestrator.py | 2 +- tracex_project/extraction/templates/result.html | 2 +- .../patient_journey_generator/__init__.py | 14 -------------- .../templates/journey_generator_overview.html | 2 +- .../templates/testing_comparison.html | 2 +- .../trace_comparator/templates/testing_result.html | 4 +++- tracex_project/tracex/__init__.py | 12 ------------ tracex_project/tracex/logic/__init__.py | 10 ---------- 8 files changed, 7 insertions(+), 41 deletions(-) diff --git a/tracex_project/extraction/logic/orchestrator.py b/tracex_project/extraction/logic/orchestrator.py index 8f782a86..da4c5891 100644 --- a/tracex_project/extraction/logic/orchestrator.py +++ b/tracex_project/extraction/logic/orchestrator.py @@ -162,7 +162,7 @@ def initialize_modules(self): } return modules - def run(self, view=None): + def run(self, view=None) -> None: """Run the modules and set default values for modules not executed.""" modules = self.initialize_modules() execution_step: int = 1 diff --git a/tracex_project/extraction/templates/result.html b/tracex_project/extraction/templates/result.html index f6715315..7a5f4fb7 100644 --- a/tracex_project/extraction/templates/result.html +++ b/tracex_project/extraction/templates/result.html @@ -28,7 +28,7 @@

Success! The TracEX pipeline produced the following results:

{% if trace_table %} - +