eric.li
/
Referentiels
forked from viennet/Referentiels
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Suppression des doubles || dans les colonnes des tableaux

This commit is contained in:
Cléo Baras 2021-04-10 10:32:16 +02:00
parent 2aa53386a5
commit c2106ada7a
6 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
latex/pn_formation.tex
View File

@ -142,19 +142,19 @@
\scalebox{0.95}{\input{synthese/S1_acs_vs_saes_ressources.tex}}
\subsection{Volumes horaires et coefficients}
\subsection{Volumes horaires et coefficients du semestre 1}
\input{synthese/S1_coeffs_saes_ressources.tex}
\newpage
% Les SAE du semestre 1 + les exemples
\subsection{Fiches SAÉs}
\subsection{Fiches SAÉs du semestre 1}
\affichageSAE{\sem}
\newpage
% Les ressources du semestre 1
\subsection{Fiches ressources}
\subsection{Fiches ressources du semestre 1}
\affichageRessource{\sem}
%%%%%%%%%%%%%%%%
@ -176,18 +176,18 @@
\scalebox{0.95}{\input{synthese/S2_acs_vs_saes_ressources.tex}}
\subsection{Volumes horaires et coefficients}
\subsection{Volumes horaires et coefficients du semestre 2}
\input{synthese/S2_coeffs_saes_ressources.tex}
\newpage
% Les SAE du semestre 2 + les exemples
\subsection{Fiches SAÉs}
\subsection{Fiches SAÉs du semestre 2}
\affichageSAE{\sem}
% Les ressources du semestre 2
\subsection{Fiches ressources}
\subsection{Fiches ressources du semestre 2}
\affichageRessource{\sem}
\section{Abbréviations}

4
latex/synthese/S1_acs_vs_saes_ressources.tex
View File

@ -1,6 +1,6 @@
\begin{tabular}[c]{|lp{4cm}||c|c|c|c|c|c||c|c|c|c|c|c|c|c|c|c|c|c|c|c|c|}
\begin{tabular}[c]{|lp{4cm}|c|c|c|c|c|c|c|c|c|c|c|c|c|c|c|c|c|c|c|c|c|}
\hline
& & \multicolumn{6}{c||}{\textcolor{saeC}{\bfseries SAÉs}}
& & \multicolumn{6}{c|}{\textcolor{saeC}{\bfseries SAÉs}}
& \multicolumn{15}{c|}{\textcolor{ressourceC}{\bfseries Ressources}}\\
\cline{3-23} & & \rotatebox[origin=l]{90}{\tiny{Se sensibiliser à l'hygiène informatique et à la cybersécurité~}}
& \rotatebox[origin=l]{90}{\tiny{S'initier aux réseaux informatiques~}}

6
latex/synthese/S1_coeffs_saes_ressources.tex
View File

@ -1,6 +1,6 @@
\begin{tabular}[c]{|rcp{6cm}||c|c||c||c|c|c|}
\begin{tabular}[c]{|rcp{6cm}|c|c|c|c|c|c|}
\hline
& & & \multicolumn{3}{c||}{\bfseries Volumes}
& & & \multicolumn{3}{c|}{\bfseries Volumes}
& \multicolumn{3}{c|}{\bfseries Coefficients}
\\ \hline
& & & \rotatebox[origin=l]{90}{\bfseries Heures de formation encadrée} & \rotatebox[origin=l]{90}{\bfseries Heures de TPs} & \rotatebox[origin=l]{90}{\bfseries Heures de projets} & \rotatebox[origin=l]{90}{\begin{tabular}{p{5cm}}
@ -89,4 +89,4 @@
8h & 4h & & & 2 & 4\\
\hline \hline \multicolumn{6}{|l}{\bfseries Total}
\\
\hline \multicolumn{3}{|r|}{\textit{SAÉs}} & \textit{11h} & \textit{36h} & \textit{80h} & \textit{48h} & \textit{33h} & \textit{42h}\\ \hline \multicolumn{3}{|r|}{\textit{Ressources}} & \textit{177h} & \textit{216h} & \textit{0h} & \textit{76} & \textit{48} & \textit{53}\\ \hline \multicolumn{3}{|r|}{\bfseries SAÉs + Ressources} & {\bfseries 188h} & {\bfseries 252h} & {\bfseries 80h} & {\bfseries 124} & {\bfseries 81} & {\bfseries 95}\\ \hline\end{tabular}
\hline \multicolumn{3}{|r|}{\textit{SAÉs}} & \textit{11h} & \textit{36h} & \textit{80h} & \textit{48} & \textit{33} & \textit{42}\\ \hline \multicolumn{3}{|r|}{\textit{Ressources}} & \textit{177h} & \textit{216h} & \textit{0h} & \textit{76} & \textit{48} & \textit{53}\\ \hline \multicolumn{3}{|r|}{\bfseries SAÉs + Ressources} & {\bfseries 188h} & {\bfseries 252h} & {\bfseries 80h} & {\bfseries 124} & {\bfseries 81} & {\bfseries 95}\\ \hline\end{tabular}

4
latex/synthese/S2_acs_vs_saes_ressources.tex
View File

@ -1,6 +1,6 @@
\begin{tabular}[c]{|lp{4cm}||c|c|c|c||c|c|c|c|c|c|c|c|c|c|c|c|c|c|}
\begin{tabular}[c]{|lp{4cm}|c|c|c|c|c|c|c|c|c|c|c|c|c|c|c|c|c|c|}
\hline
& & \multicolumn{4}{c||}{\textcolor{saeC}{\bfseries SAÉs}}
& & \multicolumn{4}{c|}{\textcolor{saeC}{\bfseries SAÉs}}
& \multicolumn{14}{c|}{\textcolor{ressourceC}{\bfseries Ressources}}\\
\cline{3-20} & & \rotatebox[origin=l]{90}{\tiny{Construire un réseau informatique pour une petite structure~}}
& \rotatebox[origin=l]{90}{\tiny{Mesurer et caractériser un signal ou un système~}}

6
latex/synthese/S2_coeffs_saes_ressources.tex
View File

@ -1,6 +1,6 @@
\begin{tabular}[c]{|rcp{6cm}||c|c||c||c|c|c|}
\begin{tabular}[c]{|rcp{6cm}|c|c|c|c|c|c|}
\hline
& & & \multicolumn{3}{c||}{\bfseries Volumes}
& & & \multicolumn{3}{c|}{\bfseries Volumes}
& \multicolumn{3}{c|}{\bfseries Coefficients}
\\ \hline
& & & \rotatebox[origin=l]{90}{\bfseries Heures de formation encadrée} & \rotatebox[origin=l]{90}{\bfseries Heures de TPs} & \rotatebox[origin=l]{90}{\bfseries Heures de projets} & \rotatebox[origin=l]{90}{\begin{tabular}{p{5cm}}
@ -80,4 +80,4 @@
24h & 6h & & 3 & 9 & \\
\hline \hline \multicolumn{6}{|l}{\bfseries Total}
\\
\hline \multicolumn{3}{|r|}{\textit{SAÉs}} & \textit{13h} & \textit{32h} & \textit{90h} & \textit{46h} & \textit{38h} & \textit{36h}\\ \hline \multicolumn{3}{|r|}{\textit{Ressources}} & \textit{198h} & \textit{222h} & \textit{0h} & \textit{68} & \textit{61} & \textit{51}\\ \hline \multicolumn{3}{|r|}{\bfseries SAÉs + Ressources} & {\bfseries 211h} & {\bfseries 254h} & {\bfseries 90h} & {\bfseries 114} & {\bfseries 99} & {\bfseries 87}\\ \hline\end{tabular}
\hline \multicolumn{3}{|r|}{\textit{SAÉs}} & \textit{13h} & \textit{32h} & \textit{90h} & \textit{46} & \textit{38} & \textit{36}\\ \hline \multicolumn{3}{|r|}{\textit{Ressources}} & \textit{198h} & \textit{222h} & \textit{0h} & \textit{68} & \textit{61} & \textit{51}\\ \hline \multicolumn{3}{|r|}{\bfseries SAÉs + Ressources} & {\bfseries 211h} & {\bfseries 254h} & {\bfseries 90h} & {\bfseries 114} & {\bfseries 99} & {\bfseries 87}\\ \hline\end{tabular}

10
python/ressource.py
View File

@ -458,11 +458,11 @@ def to_latex_matrice_acs(matrice, saes, ressources, sem):
nbre_ressources = len(DATA_RESSOURCES[sem])
nbre_colonnes = nbre_saes + nbre_ressources + 2
longueur = 4
chaine = "\\begin{tabular}[c]{|lp{%scm}||" % str(longueur) + "c|"*(nbre_saes) + "|" + "c|"*(nbre_ressources) + "}" + "\n"
chaine = "\\begin{tabular}[c]{|lp{%scm}|" % str(longueur) + "c|"*(nbre_saes) + "c|"*(nbre_ressources) + "}" + "\n"
chaine += "\\hline \n" # % (nbre_saes + nbre_ressources+1)+ "\n"
# l'entete
chaine += " & & "
chaine += "\multicolumn{%d}{c||}{\\textcolor{saeC}{\\bfseries SAÉs}}" % (nbre_saes) + "\n"
chaine += "\multicolumn{%d}{c|}{\\textcolor{saeC}{\\bfseries SAÉs}}" % (nbre_saes) + "\n"
chaine += " & "
chaine += "\multicolumn{%d}{c|}{\\textcolor{ressourceC}{\\bfseries Ressources}}" % (nbre_ressources) + "\\\\ \n"
chaine += "\\cline{3-%d}" % (nbre_colonnes)
@ -560,10 +560,10 @@ def to_latex_matrice_coeffs(matrice_vols, matrice_coeffs, saes, ressources, sem)
nbre_colonnes = len(comps) + 3
chaine = "\\begin{tabular}[c]{|rcp{6cm}||" + "c|" * 2 + "|c|" + "|" + "c|"*(len(comps)) + "}" + "\n"
chaine = "\\begin{tabular}[c]{|rcp{6cm}|" + "c|" * 2 + "c|" + "c|"*(len(comps)) + "}" + "\n"
chaine += "\\hline \n" # % (nbre_saes + nbre_ressources+1)+ "\n"
# le début
chaine += " & & & " + "\\multicolumn{3}{c||}{\\bfseries Volumes} \n"
chaine += " & & & " + "\\multicolumn{3}{c|}{\\bfseries Volumes} \n"
chaine += " & " + "\\multicolumn{3}{c|}{\\bfseries Coefficients} \n"
chaine += " \\\\ \\hline \n"
# l'entete
@ -635,7 +635,7 @@ def to_latex_matrice_coeffs(matrice_vols, matrice_coeffs, saes, ressources, sem)
for i in range(3):
chaine += " & \\textit{" + str(total_heures_sae[i]) + "h}"
for i in range(3):
chaine += " & \\textit{" + str(total_coeffs_sae[i]) + "h}"
chaine += " & \\textit{" + str(total_coeffs_sae[i]) + "}"
chaine += "\\\\ \hline "
chaine += "\multicolumn{3}{|r|}{\\textit{Ressources}} "
for i in range(3):