From e5aca6d5536eff2c2a8e960ed426c83f1f555720 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C5=A1per=20Fele-=C5=BDor=C5=BE?= Date: Mon, 11 Sep 2023 12:40:18 +0200 Subject: [PATCH] Urejanje / usklajevanje win in lin seznama predmetov --- roles/winroom/tasks/AAHRP-63263.yml | 4 ++-- roles/winroom/tasks/APS1-63279.yml | 7 +++---- roles/winroom/tasks/ARP1-63545C.yml | 2 +- roles/winroom/tasks/EP-63249.yml | 2 +- roles/winroom/tasks/IS-63714.yml | 2 +- roles/winroom/tasks/IVZ-63521.yml | 4 ++-- roles/winroom/tasks/KCR-63550.yml | 2 +- roles/winroom/tasks/OR-63717.yml | 8 ++++---- roles/winroom/tasks/ORS-63218.yml | 6 ++++++ roles/winroom/tasks/OS-63741.yml | 3 +++ roles/winroom/tasks/P2-63278.yml | 8 ++++++++ roles/winroom/tasks/P2-63706.yml | 4 ++-- roles/winroom/tasks/PB-63707.yml | 4 ++-- roles/winroom/tasks/PPJ-63220.yml | 7 +++++-- roles/winroom/tasks/PSP-63287.yml | 2 +- roles/winroom/tasks/RK-63209.yml | 4 ++-- roles/winroom/tasks/RK-63708.yml | 4 ++-- roles/winroom/tasks/SP-63255.yml | 6 ++++++ roles/winroom/tasks/ST-63727.yml | 2 +- roles/winroom/tasks/TUP-63226.yml | 4 ++-- roles/winroom/tasks/UV-63721.yml | 7 ++++--- roles/winroom/tasks/UZ-63267.yml | 1 + roles/winroom/tasks/VN-63728.yml | 2 ++ roles/winroom/tasks/VP-63775.yml | 13 +++++++++++++ 24 files changed, 75 insertions(+), 33 deletions(-) create mode 100644 roles/winroom/tasks/ORS-63218.yml create mode 100644 roles/winroom/tasks/P2-63278.yml create mode 100644 roles/winroom/tasks/SP-63255.yml create mode 100644 roles/winroom/tasks/VP-63775.yml diff --git a/roles/winroom/tasks/AAHRP-63263.yml b/roles/winroom/tasks/AAHRP-63263.yml index 4bab28f..0e66b32 100644 --- a/roles/winroom/tasks/AAHRP-63263.yml +++ b/roles/winroom/tasks/AAHRP-63263.yml @@ -2,5 +2,5 @@ # matej.piculin@fri.uni-lj.si # Windows, Java JDK, Eclipse, R, RStudio - include_tasks: rstudio.yml -- include_tasks: Eclipse.yml -- include_tasks: JDK.yml +- include_tasks: eclipse.yml +- include_tasks: jdk.yml diff --git a/roles/winroom/tasks/APS1-63279.yml b/roles/winroom/tasks/APS1-63279.yml index a4fa9a2..b35fcad 100644 --- a/roles/winroom/tasks/APS1-63279.yml +++ b/roles/winroom/tasks/APS1-63279.yml @@ -1,9 +1,8 @@ # Algoritmi in podatkovne strukture 1 -# bojan.zunkovic@fri.uni-lj.si, polz@fri.uni-lj.si +# tomaz.hocevar@fri.uni-lj.si, bojan.zunkovic@fri.uni-lj.si, polz@fri.uni-lj.si # Windows, Java JDK, Eclipse # - include_tasks: JDK.yml -# - include_tasks: OracleJDK.yml # - include_tasks: Eclipse.yml -include_tasks: c_development.yml -include_tasks: vscode.yml +- include_tasks: c_development.yml +- include_tasks: vscode.yml diff --git a/roles/winroom/tasks/ARP1-63545C.yml b/roles/winroom/tasks/ARP1-63545C.yml index 006c924..4c50bf0 100644 --- a/roles/winroom/tasks/ARP1-63545C.yml +++ b/roles/winroom/tasks/ARP1-63545C.yml @@ -1,4 +1,4 @@ # Aktualno raziskovalno področje 1 # Veljko.Pejovic@fri.uni-lj.si # Android Studio -- include_tasks: Android_Studio.yml +- include_tasks: android_studio.yml diff --git a/roles/winroom/tasks/EP-63249.yml b/roles/winroom/tasks/EP-63249.yml index 3d902c2..1cc049d 100644 --- a/roles/winroom/tasks/EP-63249.yml +++ b/roles/winroom/tasks/EP-63249.yml @@ -3,4 +3,4 @@ # Windows, VirtualBox, Android Studio # - include_tasks: virtualbox.yml -- include_tasks: Android_Studio.yml +- include_tasks: android_studio.yml diff --git a/roles/winroom/tasks/IS-63714.yml b/roles/winroom/tasks/IS-63714.yml index b4f36eb..2dd62b0 100644 --- a/roles/winroom/tasks/IS-63714.yml +++ b/roles/winroom/tasks/IS-63714.yml @@ -6,5 +6,5 @@ - include_tasks: vscode.yml - include_tasks: dotnet6.yml - include_tasks: git.yml -- include_tasks: Android_Studio.yml +- include_tasks: android_studio.yml diff --git a/roles/winroom/tasks/IVZ-63521.yml b/roles/winroom/tasks/IVZ-63521.yml index fa776af..ca0a419 100644 --- a/roles/winroom/tasks/IVZ-63521.yml +++ b/roles/winroom/tasks/IVZ-63521.yml @@ -1,6 +1,6 @@ # Informacijska varnost in zasebnost # David.Jelenc@fri.uni-lj.si # Java JDK, IntelliJ IDEA, VirtualBox -- include_tasks: JDK.yml -- include_tasks: IDEA.yml +- include_tasks: jdk.yml +- include_tasks: idea.yml - include_tasks: virtualbox.yml diff --git a/roles/winroom/tasks/KCR-63550.yml b/roles/winroom/tasks/KCR-63550.yml index c22ea88..9fa8298 100644 --- a/roles/winroom/tasks/KCR-63550.yml +++ b/roles/winroom/tasks/KCR-63550.yml @@ -1,7 +1,7 @@ # Komunikacija človek računalnik # Ales.Smrdel@fri.uni-lj.si # Java JDK, Matlab, wfdb, Apache NetBeans -- include_tasks: JDK.yml +- include_tasks: jdk.yml - include_tasks: matlab.yml - include_tasks: wfdb.yml - include_tasks: netbeans.yml diff --git a/roles/winroom/tasks/OR-63717.yml b/roles/winroom/tasks/OR-63717.yml index ccd058b..7bac823 100644 --- a/roles/winroom/tasks/OR-63717.yml +++ b/roles/winroom/tasks/OR-63717.yml @@ -3,7 +3,7 @@ # Windows, Logisim, Logisim Evolution, RAVINOR, CubeIDE + QEMU Embedded plugin - include_tasks: logisim.yml - include_tasks: stm32cube.yml -#- include_tasks: ninja.yml -#- include_tasks: cmake.yml -#- include_tasks: gcc-arm.yml -# TODO: RAVINOR +- include_tasks: ninja.yml +- include_tasks: cmake.yml +- include_tasks: gcc-arm.yml +# TODO: RAVINOR, CubeIDE diff --git a/roles/winroom/tasks/ORS-63218.yml b/roles/winroom/tasks/ORS-63218.yml new file mode 100644 index 0000000..525ca93 --- /dev/null +++ b/roles/winroom/tasks/ORS-63218.yml @@ -0,0 +1,6 @@ +# Osnove Računalniških Sistemov +# Patricio.Bulic@fri.uni-lj.si +# + +- include_tasks: vscode.yml +- include_tasks: sifive.yml diff --git a/roles/winroom/tasks/OS-63741.yml b/roles/winroom/tasks/OS-63741.yml index 4d5e31d..9e56fad 100644 --- a/roles/winroom/tasks/OS-63741.yml +++ b/roles/winroom/tasks/OS-63741.yml @@ -1,3 +1,6 @@ # Odločitveni sistemi # Martin.Mozina@fri.uni-lj.si # Windows +- name: Odlocitveni sistemi + debug: + msg: "Odločitveni sistemi 63741 - brez zahtev" diff --git a/roles/winroom/tasks/P2-63278.yml b/roles/winroom/tasks/P2-63278.yml new file mode 100644 index 0000000..45b8e25 --- /dev/null +++ b/roles/winroom/tasks/P2-63278.yml @@ -0,0 +1,8 @@ +# Programiranje 2 +# bostjan.slivnik@fri.uni-lj.si +# gedit, vscode, pdf viewer (evince), gcc, g++, make, JDK + +- include_tasks: jdk.yml +- include_tasks: gedit.yml +- include_tasks: vscode.yml +- include_tasks: c_development.yml diff --git a/roles/winroom/tasks/P2-63706.yml b/roles/winroom/tasks/P2-63706.yml index b1004e6..f704f51 100644 --- a/roles/winroom/tasks/P2-63706.yml +++ b/roles/winroom/tasks/P2-63706.yml @@ -2,6 +2,6 @@ # Tomaz.Dobravec@fri.uni-lj.si # Windows, Java JDK, IntelliJ IDEA, Apache NetBeans -- include_tasks: JDK.yml -- include_tasks: IDEA.yml +- include_tasks: jdk.yml +- include_tasks: idea.yml - include_tasks: netbeans.yml diff --git a/roles/winroom/tasks/PB-63707.yml b/roles/winroom/tasks/PB-63707.yml index ee690dc..c142839 100644 --- a/roles/winroom/tasks/PB-63707.yml +++ b/roles/winroom/tasks/PB-63707.yml @@ -1,10 +1,10 @@ # Podatkovne baze # Ales.Jaklic@fri.uni-lj.si, matej.piculin@fri.uni-lj.si, Luka.Sajn@fri.uni-lj.si # Windows, Power designer 12.5, Java JDK, Python 3, dotnet6 SDK, Jupyter Notebook, Eclipse, MySql Workbench, MySQL ODBC Connector, Notepad++ -- include_tasks: Eclipse.yml +- include_tasks: eclipse.yml - include_tasks: dotnet6.yml - include_tasks: jupyter.yml -- include_tasks: JDK.yml +- include_tasks: jdk.yml - include_tasks: powerdesigner.yml - include_tasks: pyodbc.yml - include_tasks: mysql_workbench.yml diff --git a/roles/winroom/tasks/PPJ-63220.yml b/roles/winroom/tasks/PPJ-63220.yml index c490204..075a5cb 100644 --- a/roles/winroom/tasks/PPJ-63220.yml +++ b/roles/winroom/tasks/PPJ-63220.yml @@ -1,8 +1,11 @@ # Principi programskih jezikov # Klemen.Klanjscek@fri.uni-lj.si -# Windows, GNU/Linux, VS Code, Eclipse, Haskell, SWI-Prolog, rlwrap +# Windows, GNU/Linux, VS Code, Ocaml, Eclipse, Haskell, SWI-Prolog, rlwrap - include_tasks: vscode.yml -- include_tasks: Eclipse.yml +- include_tasks: ocaml.yml +- include_tasks: eclipse.yml - include_tasks: haskell.yml - include_tasks: swi-prolog.yml +- include_tasks: rlwrap.yml + diff --git a/roles/winroom/tasks/PSP-63287.yml b/roles/winroom/tasks/PSP-63287.yml index 7a9c97c..6e86917 100644 --- a/roles/winroom/tasks/PSP-63287.yml +++ b/roles/winroom/tasks/PSP-63287.yml @@ -2,5 +2,5 @@ # Veljko.Pejovic@fri.uni-lj.si # Android Studio, Arduino IDE -- include_tasks: Android_Studio.yml +- include_tasks: android_studio.yml - include_tasks: arduino.yml diff --git a/roles/winroom/tasks/RK-63209.yml b/roles/winroom/tasks/RK-63209.yml index bee15c1..fe7a9b8 100644 --- a/roles/winroom/tasks/RK-63209.yml +++ b/roles/winroom/tasks/RK-63209.yml @@ -2,8 +2,8 @@ # Ales.Jaklic@fri.uni-lj.si, Matjaz.Pancur@fri.uni-lj.si, Jure.Tuta@fri.uni-lj.si, Domen.Kosir@fri.uni-lj.si # GNU/Linux, GNS3, Docker, VS Code, wireshark, Java JDK, Python 3 - include_tasks: docker.yml -- include_tasks: GNS3.yml +- include_tasks: gns3.yml - include_tasks: vscode.yml - include_tasks: wireshark.yml -- include_tasks: JDK.yml +- include_tasks: jdk.yml diff --git a/roles/winroom/tasks/RK-63708.yml b/roles/winroom/tasks/RK-63708.yml index c3dea0d..d03d8c0 100644 --- a/roles/winroom/tasks/RK-63708.yml +++ b/roles/winroom/tasks/RK-63708.yml @@ -2,8 +2,8 @@ # Matjaz.Pancur@fri.uni-lj.si, Miha.Grohar@fri.uni-lj.si # GNU/Linux, GNS3, Docker, VS Code, wireshark, Java JDK, Python 3 - include_tasks: docker.yml -- include_tasks: GNS3.yml +- include_tasks: gns3.yml - include_tasks: vscode.yml - include_tasks: wireshark.yml -- include_tasks: JDK.yml +- include_tasks: jdk.yml diff --git a/roles/winroom/tasks/SP-63255.yml b/roles/winroom/tasks/SP-63255.yml new file mode 100644 index 0000000..f0a42a4 --- /dev/null +++ b/roles/winroom/tasks/SP-63255.yml @@ -0,0 +1,6 @@ +# Spletno Programiranje +# dejan.lavbic@fri.uni-lj.si +# git, docker, Node.js + npm, Visual Studio Code +- include_tasks: git.yml +- include_tasks: docker.yml +- include_tasks: nodejs.yml diff --git a/roles/winroom/tasks/ST-63727.yml b/roles/winroom/tasks/ST-63727.yml index 66e48a3..5fa86f8 100644 --- a/roles/winroom/tasks/ST-63727.yml +++ b/roles/winroom/tasks/ST-63727.yml @@ -2,4 +2,4 @@ # David.Jelenc@fri.uni-lj.si # Windows, VS Code, XAMPP - include_tasks: vscode.yml -- include_tasks: XAMPP.yml +- include_tasks: xampp.yml diff --git a/roles/winroom/tasks/TUP-63226.yml b/roles/winroom/tasks/TUP-63226.yml index 73bd12c..3239da9 100644 --- a/roles/winroom/tasks/TUP-63226.yml +++ b/roles/winroom/tasks/TUP-63226.yml @@ -1,10 +1,10 @@ # Tehnologija upravljanja podatkov # Luka.Sajn@fri.uni-lj.si # Windows, Power designer 12.5, Java JDK, Python 3, dotnet6 SDK, Jupyter Notebook, Eclipse, MySql Workbench, MySQL ODBC Connector, Notepad++ -- include_tasks: Eclipse.yml +- include_tasks: eclipse.yml - include_tasks: dotnet6.yml - include_tasks: jupyter.yml -- include_tasks: JDK.yml +- include_tasks: jdk.yml - include_tasks: powerdesigner.yml - include_tasks: mysql_workbench.yml - include_tasks: mysql-odbc-connector.yml diff --git a/roles/winroom/tasks/UV-63721.yml b/roles/winroom/tasks/UV-63721.yml index e922aa4..419849d 100644 --- a/roles/winroom/tasks/UV-63721.yml +++ b/roles/winroom/tasks/UV-63721.yml @@ -1,7 +1,8 @@ # Uporabniški vmesniki # Ales.Smrdel@fri.uni-lj.si # Windows, GNU/Linux, Java JDK, IntelliJ IDEA, javafx, SceneBuilder, X11 development, Wayland development, gtk+ development, glade, python -- include_tasks: JDK.yml -- include_tasks: IDEA.yml +- include_tasks: jdk.yml +- include_tasks: idea.yml - include_tasks: javafx.yml -- include_tasks: SceneBuilder.yml +- include_tasks: gui_development.yml +- include_tasks: scenebuilder.yml diff --git a/roles/winroom/tasks/UZ-63267.yml b/roles/winroom/tasks/UZ-63267.yml index 192e871..ee2c984 100644 --- a/roles/winroom/tasks/UZ-63267.yml +++ b/roles/winroom/tasks/UZ-63267.yml @@ -1,3 +1,4 @@ # Umetno zaznavanje # jon.muhovic@fe.uni-lj.si +# Python3, Python 3 - include_tasks: python3.yml diff --git a/roles/winroom/tasks/VN-63728.yml b/roles/winroom/tasks/VN-63728.yml index 1fb0ac1..3fb8d44 100644 --- a/roles/winroom/tasks/VN-63728.yml +++ b/roles/winroom/tasks/VN-63728.yml @@ -4,4 +4,6 @@ - include_tasks: logisim.yml - include_tasks: winidea-frisms.yml +- include_tasks: winidea.yml - include_tasks: ltspice.yml + diff --git a/roles/winroom/tasks/VP-63775.yml b/roles/winroom/tasks/VP-63775.yml new file mode 100644 index 0000000..e7c34e3 --- /dev/null +++ b/roles/winroom/tasks/VP-63775.yml @@ -0,0 +1,13 @@ +# Varnost Podatkov +# david.jelenc@fri.uni-lj.si +# Python (in standardno pripadajoča šara jupyter lab) in IntelliJ IDEA PyCharm CE +# PyCharm +# Java (kar je bilo lani bo ok) in IntelliJ IDEA CE +# maven +# git +- include_tasks: git.yml +- include_tasks: maven.yml +- include_tasks: idea.yml +- include_tasks: jdk.yml +- include_tasks: jupyter.yml +- include_tasks: pycharm.yml