From 093bc38d8a20497b33238648a32c23cd653e30dc Mon Sep 17 00:00:00 2001 From: Anne Schuth Date: Thu, 10 Oct 2024 11:04:43 +0200 Subject: [PATCH 1/2] Fix save decision tree logic --- amt/locale/base.pot | 10 ++++++++- amt/locale/en_US/LC_MESSAGES/messages.mo | Bin 451 -> 451 bytes amt/locale/en_US/LC_MESSAGES/messages.po | 10 ++++++++- amt/locale/nl_NL/LC_MESSAGES/messages.mo | Bin 5304 -> 5344 bytes amt/locale/nl_NL/LC_MESSAGES/messages.po | 14 +++++++++--- amt/site/static/ts/amt.ts | 4 ++++ amt/site/templates/projects/new.html.j2 | 27 ++++++++++------------- script/server | 5 +++++ 8 files changed, 50 insertions(+), 20 deletions(-) create mode 100755 script/server diff --git a/amt/locale/base.pot b/amt/locale/base.pot index 61489aaa..67deec0d 100644 --- a/amt/locale/base.pot +++ b/amt/locale/base.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-10-09 19:49+0200\n" +"POT-Creation-Date: 2024-10-10 11:00+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -147,6 +147,10 @@ msgstr "" msgid "An error occurred. Please try again later" msgstr "" +#: amt/site/templates/layouts/base.html.j2:11 +msgid "Algorithmic Management Toolkit (AMT)" +msgstr "" + #: amt/site/templates/macros/tasks.html.j2:14 msgid "Todo" msgstr "" @@ -339,3 +343,7 @@ msgstr "" msgid "Create Project" msgstr "" +#: amt/site/templates/projects/new.html.j2:152 +msgid "Copy results and close" +msgstr "" + diff --git a/amt/locale/en_US/LC_MESSAGES/messages.mo b/amt/locale/en_US/LC_MESSAGES/messages.mo index 7e5e04d833e175238f6c15303c9f5448b5f22f6e..888525f508e901e3484a22677fe6a02c8b064892 100644 GIT binary patch delta 19 acmX@ie3*H{1P((31w%tC1A~n-v>5?D0|lo5 delta 19 acmX@ie3*H{1P%jB1w#`n6Z4HTv>5?Dtp&XR diff --git a/amt/locale/en_US/LC_MESSAGES/messages.po b/amt/locale/en_US/LC_MESSAGES/messages.po index 9a399482..a6c51330 100644 --- a/amt/locale/en_US/LC_MESSAGES/messages.po +++ b/amt/locale/en_US/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-10-09 19:49+0200\n" +"POT-Creation-Date: 2024-10-10 11:00+0200\n" "PO-Revision-Date: 2024-07-25 21:01+0200\n" "Last-Translator: FULL NAME \n" "Language: en_US\n" @@ -148,6 +148,10 @@ msgstr "" msgid "An error occurred. Please try again later" msgstr "" +#: amt/site/templates/layouts/base.html.j2:11 +msgid "Algorithmic Management Toolkit (AMT)" +msgstr "" + #: amt/site/templates/macros/tasks.html.j2:14 msgid "Todo" msgstr "" @@ -340,6 +344,10 @@ msgstr "" msgid "Create Project" msgstr "" +#: amt/site/templates/projects/new.html.j2:152 +msgid "Copy results and close" +msgstr "" + #~ msgid "TEST" #~ msgstr "" diff --git a/amt/locale/nl_NL/LC_MESSAGES/messages.mo b/amt/locale/nl_NL/LC_MESSAGES/messages.mo index 403ca90f2a04d3139cb0c65e567716734a114dbf..f675f2e1e78e5ef086219d6d0083d0735cb3fc2f 100644 GIT binary patch delta 1178 zcmXZbOK1~89LMoVnxyZiX|<)bt5qQgk{o=W1hohrR8SCnQ0)9#j-l zQ3R156fE?hsimz*5u{ij2T}U~mFl6OAXF(RMa1vVT^QywGdugAng8q#My4ZI`?Gb% zm?eeARNy)cV=D%5AC_VpQcNdR1Tz@KJE(bgu@ZZ65e{Q5zD33VikfGNT!W~%B}FD{ znrYNAP>*Y{1$UqVr7?t;kz%^3%J8<=??r7Sk0m&S1^5iLz;pEDJG5{DDdsm-7y62` zZosp}t`|`gZlW^Ln!xgdw#9l&ES2{*Qf*iz($g;}$MfoC4NtFCenP>;&kdepqF zs0{3P$Ft@T4ZV=W2%bU?V|q{v_8~FN04l&JYQrDB{x4K&E7+9+hfxdGV-v2x<+vG_ z;W2Og3Wjv#J{o$lA1P*tN&#M?0#Bkg^vUagL$YXQQCIU9SE0Yg%}5N-)8B|X*i%%z zG4J^}E}%b+L8W|-hCZ%&Z$gl#>Q|x`Xg~#6jM~sjyoWJ7ij$~?Hu1&EZAd7y6P3Ys z)L+zz`liyTtLnxk{T_of^uInv1$cvcVJbfs*z2!No;Yo#Y$wx^cC5BUyLGrD>DYOz z@JS%|rSy1FENaDK8=}$t?y`pk&Aa|jY)jh-D|ymRCG1XG6sIE-XD}D48u7K}N2|*H ap*?oWjyw4eH8*^|M9vAX4cRFtZkvBc%!?8L delta 1138 zcmXZbT}YEr9LMqh=4{TXt-0PL(X=i`5Q`L>Pj=8g5PVpYZQ~8#?Xfe4B|ed*a502c49e>qUK$~)tJQ%IF4)a39iF;sChqJf1%>8U;`HYma&aA z8Y;}1F^&q4DX{Bm_{!?#YUV%ihZRzj?1Wc$v~#m z7zmUmoJ3{fg4-WMEij3CA&(TBqteM_*0U@PwAf@KdX&=@MfByvc5j9T~^>IxT78!MtR<`0#gM^GEzh8m9{ z^D?%ZMwEdBatKSK78*uk*csFUS5X_i>-L|cQu_%NcnKBw8`k3=+=^j#y9IZl#ye2o z)-d{X#cAiQBuA>4^pf+^R?av_DvjXaBUgLIri^@b1&tf24%D`n*yd3KJ9jwI% zsQB|(sg%EFixRT9p;Obb;uNJLS?WOb<#bkZz_Sh za|iWzjAFh1*NZe1;FjwY>c#2&OW#3nKJK6O`MT37C%Y2tt%$`NceJ#(wB?gk56iOg sP{EVT{|!}p1A9~b1AT)>om4(poAYGHBW*S5-tMlhlnpt3{XLHT2bisWrvLx| diff --git a/amt/locale/nl_NL/LC_MESSAGES/messages.po b/amt/locale/nl_NL/LC_MESSAGES/messages.po index c6e1f434..9cf6c9c3 100644 --- a/amt/locale/nl_NL/LC_MESSAGES/messages.po +++ b/amt/locale/nl_NL/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-10-09 19:49+0200\n" +"POT-Creation-Date: 2024-10-10 11:00+0200\n" "PO-Revision-Date: 2024-07-25 21:01+0200\n" "Last-Translator: FULL NAME \n" "Language: nl_NL\n" @@ -154,6 +154,10 @@ msgstr "Er is een fout opgetreden" msgid "An error occurred. Please try again later" msgstr "Er is een fout opgetreden. Probeer het later opnieuw." +#: amt/site/templates/layouts/base.html.j2:11 +msgid "Algorithmic Management Toolkit (AMT)" +msgstr "Algoritme Management Toolkit (AMT)" + #: amt/site/templates/macros/tasks.html.j2:14 msgid "Todo" msgstr "Te doen" @@ -340,8 +344,8 @@ msgid "" "Overview of instruments for the responsible development, deployment, " "assessment and monitoring of algorithms and AI-systems." msgstr "" -"Overzicht van aanbevolen insturment voor het verantwoord ontwikkelen, " -"gebruiken,beoordelen en monitren van algoritmes en AI-systemen." +"Overzicht van aanbevolen instrument voor het verantwoord ontwikkelen, " +"gebruiken, beoordelen en monitoren van algoritmes en AI-systemen." #: amt/site/templates/projects/new.html.j2:124 msgid "Choose one or more instruments" @@ -351,6 +355,10 @@ msgstr "Kies één of meerdere instrumenten" msgid "Create Project" msgstr "Maak project" +#: amt/site/templates/projects/new.html.j2:152 +msgid "Copy results and close" +msgstr "Resultaten overnemen en sluiten" + #~ msgid "TEST" #~ msgstr "" diff --git a/amt/site/static/ts/amt.ts b/amt/site/static/ts/amt.ts index 3edc8d6e..ae3754aa 100644 --- a/amt/site/static/ts/amt.ts +++ b/amt/site/static/ts/amt.ts @@ -124,6 +124,10 @@ export function closeModal() { if (el != null) { el.classList.add("display-none"); } +} + +export function closeModalSave() { + closeModal(); // Get decision tree state from local store. const decision_tree_state = localStorage?.getItem("labelsbycategory"); diff --git a/amt/site/templates/projects/new.html.j2 b/amt/site/templates/projects/new.html.j2 index faec7e10..661695ff 100644 --- a/amt/site/templates/projects/new.html.j2 +++ b/amt/site/templates/projects/new.html.j2 @@ -144,19 +144,16 @@ - + {% endblock content %} diff --git a/script/server b/script/server new file mode 100755 index 00000000..5e69e1d2 --- /dev/null +++ b/script/server @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -x + +docker compose up From 044ce9f1021fead7cea9c3627749d29c50990873 Mon Sep 17 00:00:00 2001 From: Anne Schuth Date: Thu, 10 Oct 2024 13:14:36 +0200 Subject: [PATCH 2/2] Docker compose in daemon mode and open browser --- script/server | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/script/server b/script/server index 5e69e1d2..ecb45025 100755 --- a/script/server +++ b/script/server @@ -2,4 +2,7 @@ set -x -docker compose up +docker compose up -d + +sleep 1 +open http://0.0.0.0:8070