may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.1ka.si/git/1ka

Browse Source
This commit is contained in:
pero1203 2021-10-22 14:31:00 +02:00
commit f8e176e492
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
admin/survey/modules/mod_NIJZ/R/Nijz_report.R
View File

@ -26,7 +26,7 @@ ID <- params[1]
#-------------------------- USER DEFINED FUNCTION ---------------------# #-------------------------- USER DEFINED FUNCTION ---------------------#
# Za potrebe pravilnega prikaza teksta v posameznih poglavjih # Za potrebe pravilnega prikaza teksta v posameznih poglavjih
lxTranslate <- function(x, color = "NE", pisava = TRUE) { lxTranslate <- function(x, color = "NE", pisava = TRUE, pikaklicaj = FALSE) {
x <- gsub("<strong>", "\\\\\\\\textbf{", x) x <- gsub("<strong>", "\\\\\\\\textbf{", x)
x <- gsub("</strong>", "}", x) x <- gsub("</strong>", "}", x)
x <- x <-
@ -39,7 +39,9 @@ lxTranslate <- function(x, color = "NE", pisava = TRUE) {
x <- gsub("%", "\\\\\\\\%", x) x <- gsub("%", "\\\\\\\\%", x)
#x <- gsub("…", "\\\\\\\\dots", x) #x <- gsub("…", "\\\\\\\\dots", x)
x <- gsub("…", "...", x) #x <- gsub("…", "", x)
# ALI BNARVAMO? # ALI BNARVAMO?
@ -47,8 +49,12 @@ lxTranslate <- function(x, color = "NE", pisava = TRUE) {
# Update, Potem pa želi NIJZ, da se prvi odstavek # Update, Potem pa želi NIJZ, da se prvi odstavek
# vedno obarva z "zeleno barvo, zaot moramo to # vedno obarva z "zeleno barvo, zaot moramo to
# utrezno ločiti # utrezno ločiti
if (pikaklicaj == FALSE) {
obarvajX <- stringr::str_extract(x, "[^.|!]+") obarvajX <- stringr::str_extract(x, "[^.|!]+")
} else {
obarvajX <- stringr::str_extract(x, "[^!]+")
}
# DOdamo barvanje # DOdamo barvanje
obarvajX_1 <- paste0("{\\\\color{zelena}", obarvajX, "}") obarvajX_1 <- paste0("{\\\\color{zelena}", obarvajX, "}")
# Nadomestimo # Nadomestimo
@ -56,14 +62,17 @@ lxTranslate <- function(x, color = "NE", pisava = TRUE) {
} }
if (pisava == TRUE) { if (pisava == TRUE) {
val <- strsplit(x, "\\\\newline ")[[1]] val <- strsplit(x, "\\\\newline ")[[1]]
# val <- val[!c(seq_along(val) %% 2 == 0)]
# Gledamo tretji # Gledamo tretji
odst <- val[4:length(val)] odst <- val[4:length(val)]
# Po drugem odstavku zmanjšamo pisavo na 9 # Po drugem odstavku zmanjšamo pisavo na 9
xsmall <- paste0("\\\\begin{footnotesize}", stringr::str_c(odst, collapse = "\\\\newline "), "\\\\end{footnotesize}") xsmall <- paste0("\\\\begin{footnotesize}", stringr::str_c(odst, collapse = "\\\\smallskip "), "\\\\end{footnotesize}")
x <- paste0(stringr::str_c(val[1:4], collapse = "\\\\newline "),xsmall) x <- paste0(stringr::str_c(val[1:4], collapse = "\\\\newline "),xsmall)
#x <- gsub("\\\\\\newline \\\\\\begin{footnotesize} ", "sd", x, fixed = T)
} }
return(x) return(x)
} }
@ -106,8 +115,8 @@ library(dplyr)
data <- read.csv2(paste0( data <- read.csv2(paste0(
"modules/mod_NIJZ/temp/nijz_",ID,".csv"), "modules/mod_NIJZ/temp/nijz_",ID,".csv"),
sep = ";", sep = ";",
header = T, header = FALSE,
fill = T, fill = TRUE,
stringsAsFactors = FALSE, stringsAsFactors = FALSE,
encoding = "UTF-8" encoding = "UTF-8"
) )
@ -345,7 +354,7 @@ colnames(mydf) <- labels
#par(col="#004078", font = 2, cex = 1.4) #par(col="#004078", font = 2, cex = 1.4)
par(col="#004078", font = 2, cex = 0.8, xpd = TRUE) par(col="#004078", font = 2, cex = 1.2, xpd = TRUE)
# Plot a radar chart # Plot a radar chart
radarchart2( radarchart2(
mydf, mydf,
@ -360,9 +369,9 @@ radarchart2(
na.itp = FALSE, na.itp = FALSE,
plwd = 3, plwd = 3,
plty = 1, plty = 1,
seg = 7, seg = 4,
axistype = 1, axistype = 1,
caxislabels = 0:7, caxislabels = 0:4,
centerzero = TRUE centerzero = TRUE
) )
@ -398,7 +407,7 @@ oblacila <- lxTranslate(oblacila, color = "DA")
#------------------------ Poletni urnik za izvajanje aktivnosti na prostem ------------------------# #------------------------ Poletni urnik za izvajanje aktivnosti na prostem ------------------------#
solarij <- data %>% filter(str_detect(V1, "SOLARIJ")) %>% select(V2) solarij <- data %>% filter(str_detect(V1, "SOLARIJ")) %>% select(V2)
solarij <- lxTranslate(solarij, color = "DA") solarij <- lxTranslate(solarij, color = "DA", pikaklicaj = TRUE)
#--- #---

4
admin/survey/modules/mod_NIJZ/latexkosi/glava-nijz.tex
View File

@ -49,7 +49,7 @@
\textbf{1. Moj FOTOTIP KOŽE:} \newline \newline !varianta! \textbf{1. Moj FOTOTIP KOŽE:} \newline \newline !varianta!
\ \\ \\ \\ \\ \ \\ \\ \\
\begin{minipage}[t]{0.40\textwidth} \begin{minipage}[t]{0.40\textwidth}
\textbf{2. POLARNI GRAFIKON} \newline \textbf{2. POLARNI GRAFIKON} \newline
\hspace*{0.5cm}- grafični prikaz mojega dosedanjega \\ \hspace*{0.5cm}- grafični prikaz mojega dosedanjega \\
@ -60,7 +60,7 @@
\begin{minipage}[t]{0.54\textwidth} \begin{minipage}[t]{0.54\textwidth}
\begin{figure}[H] \begin{figure}[H]
\vspace*{-0.5cm} \vspace*{-0.5cm}
\efbox{\includegraphics[width=10cm,height=8.1cm]{../results/img/radar.png}} \efbox{\includegraphics[width=10cm,height=7.5cm]{../results/img/radar.png}}
\end{figure} \end{figure}
\end{minipage} \end{minipage}
\end{titlepage} \end{titlepage}