From 18c8b3dde62df0ea17e0fb8e42e343171329b0ba Mon Sep 17 00:00:00 2001 From: Miha Date: Wed, 2 Dec 2020 18:34:20 +0100 Subject: [PATCH] =?UTF-8?q?Evoli=20(slo,=20ang):=20V=20primeru=20erorrja?= =?UTF-8?q?=20generiramo=20poro=C4=8Dilo,=20kjer=20izpi=C5=A1emo=20vzroke?= =?UTF-8?q?=20le=20tega.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mod_EVOLI/R/Evoli_quality_clime_ang.R | 23 ++++++++++++++++++- .../mod_EVOLI/R/Evoli_quality_clime_slo.R | 22 +++++++++++++++++- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/admin/survey/modules/mod_EVOLI/R/Evoli_quality_clime_ang.R b/admin/survey/modules/mod_EVOLI/R/Evoli_quality_clime_ang.R index 19b24f15b..a21355210 100644 --- a/admin/survey/modules/mod_EVOLI/R/Evoli_quality_clime_ang.R +++ b/admin/survey/modules/mod_EVOLI/R/Evoli_quality_clime_ang.R @@ -77,6 +77,8 @@ data <- subset(data, oddelek_ime != -1) data <- subset(data, status == 6) #--------------------------- //IMPORT DATA// --------------------------# +# Preverimo ali oddelki obstajajo v nasprotnem bomo na to opozorili +if(nrow(data) > 0) { # TEAMS / ODDELKI # #################### @@ -1005,4 +1007,23 @@ tex.izbor <- c( setwd(paste(Rdirektorij, "modules/mod_EVOLI/results", sep="/")) # File folder cat(unlist(tex.izbor), file=paste0("Quality-climate.tex"), sep="\n") # Name of tex file tools::texi2pdf(file=paste0("Quality-climate.tex"), quiet=TRUE, clean=TRUE) # Pdf file -setwd(Rdirektorij) \ No newline at end of file +setwd(Rdirektorij) + +} else { + # Če ni oddelkov to napiši + Rdirektorij <- getwd() # Get working diretory + + # Compiling file + tex.izbor <- c( + "\\documentclass{article} + \\begin{document} + Data for department (department name) is missing in the data. Please check! + \\end{document}" + ) + + + setwd(paste(Rdirektorij, "modules/mod_EVOLI/results", sep="/")) # File folder + cat(unlist(tex.izbor), file=paste0("Quality-climate.tex"), sep="\n") # Name of tex file + tools::texi2pdf(file=paste0("Quality-climate.tex"), quiet=TRUE, clean=TRUE) # Pdf file + setwd(Rdirektorij) +} \ No newline at end of file diff --git a/admin/survey/modules/mod_EVOLI/R/Evoli_quality_clime_slo.R b/admin/survey/modules/mod_EVOLI/R/Evoli_quality_clime_slo.R index 152aeac41..52187c9f3 100644 --- a/admin/survey/modules/mod_EVOLI/R/Evoli_quality_clime_slo.R +++ b/admin/survey/modules/mod_EVOLI/R/Evoli_quality_clime_slo.R @@ -88,6 +88,9 @@ data <- subset(data, status == 6) #--------------------------- //IMPORT DATA// --------------------------# +# Preverimo ali oddelki obstajajo v nasprotnem bomo na to opozorili +if(nrow(data) > 0) { + # TEAMS / ODDELKI # #################### # Skupine na podlagi katerih se bodo ra\u010Dunale vrednosti in izrisovale v grafih (glej SINTAX SPODAJ) @@ -971,5 +974,22 @@ cat(unlist(tex.izbor), file=paste0("Klima-kakovosti.tex"), sep="\n") # Name of tools::texi2pdf(file=paste0("Klima-kakovosti.tex"), quiet=TRUE, clean=TRUE) # Pdf file setwd(Rdirektorij) - +} else { + # Če ni oddelkov to napiši + Rdirektorij <- getwd() # Get working diretory + + # Compiling file + tex.izbor <- c( + "\\documentclass{article} + \\begin{document} + V podatkih manjka podatek za oddelek (ime oddelka). Prosim preverite! + \\end{document}" + ) + + + setwd(paste(Rdirektorij, "modules/mod_EVOLI/results", sep="/")) # File folder + cat(unlist(tex.izbor), file=paste0("Quality-climate.tex"), sep="\n") # Name of tex file + tools::texi2pdf(file=paste0("Quality-climate.tex"), quiet=TRUE, clean=TRUE) # Pdf file + setwd(Rdirektorij) +}