Minir fixes to templates, new copy script

trojsten · Nov 23, 2024 · 3e772fc · 3e772fc
1 parent 4a56910
commit 3e772fc
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/dgs-copy.py b/dgs-copy.py
@@ -6,8 +6,8 @@
 from typing import Tuple
 
 
-VERSION = "3.04"
-DATE = "2023-11-22"
+VERSION = "4.0"
+DATE = "2024-11-23"
 
 
 def fire(query):
@@ -80,7 +80,7 @@ def main():
     # rsync everything to server
     if not args.dry_run:
         fire(f"rsync --recursive --compress --verbose --partial --progress --copy-links --chmod=775 "
-             f"tasks {args.user}@ksp:/var/www-archiv/trojstenweb/")
+             f"tasks trojstenweb@ksp:/var/www/trojstenweb/")
 
     # delete the temporary structure
     fire("rm -rf tasks")

diff --git a/modules/naboj/templates/constants.jtt b/modules/naboj/templates/constants.jtt
@@ -34,7 +34,7 @@
                                 <no symbol defined>
                             (@ endif @) &
                             (@ if 'value' in constant and 'symbol' in constant @)
-                                $\SI[(@ if 'siextra' in constant @)(* constant.siextra *)(@ endif @)]{(* constant.value *)}{(* constant.unit *)}$
+                                $\qty[(@ if 'siextra' in constant @)(* constant.siextra *)(@ endif @)]{(* constant.value *)}{(* constant.unit *)}$
                             (@ else @)
                                 \textbf{\textcolor{red}{no value or unit defined}}
                             (@ endif @) \\

diff --git a/modules/scholar/templates/homework-base.jtt b/modules/scholar/templates/homework-base.jtt
@@ -11,7 +11,7 @@
 
         \titleformat{\section}[block]{\Huge\bfseries\centering}{}{0pt}{}
         \titleformat{\subsection}[hang]{\Large\bfseries\vspace{4mm}\vspace*{-4mm}}{\arabic{section}.\arabic{subsection}\quad}{0pt}{}
-        \titleformat{\subsubsection}[hang]{\bfseries}{}{0pt}{\arabic{section}.\arabic{subsection}\alph{subsubsection}\quad}[]
+        \titleformat{\subsubsection}[hang]{\bfseries}{}{0pt}{}[]
         \titleformat{\paragraph}[hang]{\it\bfseries}{}{0pt}{}[]
         \titlespacing{\section}{0pt}{6mm}{2mm}
         \titlespacing{\subsection}{0pt}{0mm}{0mm}

diff --git a/modules/scholar/templates/homework-students.jtt b/modules/scholar/templates/homework-students.jtt
@@ -2,6 +2,7 @@
 
 (@ block sections @)
     (@ for problem in issue.problems @)
+        \setActive{\rootDirectory/(* module.id *)/(* course.id *)/(* year.id *)/(* self.typedir() *)/(* issue.id *)/(* problem.id *)}%
         \subsection{%
             \texorpdfstring{%
                 (* problem.name *)(@ if 'bonus' in problem and problem.bonus @) (bonus)(@ endif @)%
@@ -10,7 +11,7 @@
             }%
         }
         \label{sec:(* problem.id *)}
-        \tryInput{\activeDirectory/(* problem.id *)/problem.tex}
+        \protectedInput{\activeDirectory/problem.tex}
         (@ if problem.subproblems|length == 0 @)
             (@ block solution scoped @)(@ endblock solution @)
         (@ endif @)