diff --git a/app/CertificateExcellence.php b/app/CertificateExcellence.php index 60a4b4ab2..b2dd6c212 100644 --- a/app/CertificateExcellence.php +++ b/app/CertificateExcellence.php @@ -24,7 +24,9 @@ class CertificateExcellence private $id; private $edition; - public function __construct($edition, $name_for_certificate, $type = "excellence", ) + private $number_of_activities; + + public function __construct($edition, $name_for_certificate, $type, $number_of_activities) { $this->edition = $edition; $this->name_of_certificate_holder = $name_for_certificate; @@ -33,7 +35,8 @@ public function __construct($edition, $name_for_certificate, $type = "excellence $this->resource_path = resource_path() . "/latex"; $this->pdflatex = config('codeweek.pdflatex_path'); $this->id = auth()->id() . '-' . str_random(10); - $this->type = $type; + $this->number_of_activities = $number_of_activities; + $this->type = $type ?? "excellence"; $this->templateName = "{$this->type}-{$this->edition}.tex"; @@ -136,6 +139,7 @@ protected function customize_and_save_latex() if ($this->type == "super-organiser") { $template = str_replace('', $this->tex_escape($this->email_of_certificate_holder), $template); $template = str_replace('', $this->tex_escape(Carbon::now()->format('d/m/Y')), $template); + $template = str_replace('', $this->tex_escape($this->number_of_activities), $template); } //save it locally diff --git a/app/Mail/NotifySuperOrganiser.php b/app/Mail/NotifySuperOrganiser.php index dbd0dc41f..a546c8bc8 100644 --- a/app/Mail/NotifySuperOrganiser.php +++ b/app/Mail/NotifySuperOrganiser.php @@ -35,7 +35,7 @@ public function __construct ($user, $edition) public function build() { return $this - ->subject("[CodeWeekEU] You are a winner !") + ->subject("[EU Code Week] You are a winner !") ->markdown('emails.en.notify-super-organiser'); } } diff --git a/app/Mail/NotifyWinner.php b/app/Mail/NotifyWinner.php index 2d05a068e..36dca6fc3 100644 --- a/app/Mail/NotifyWinner.php +++ b/app/Mail/NotifyWinner.php @@ -35,7 +35,7 @@ public function __construct ($user, $edition) public function build() { return $this - ->subject("[CodeWeekEU] You are a winner !") + ->subject("[EU Code Week] You are a winner !") ->markdown('emails.en.notify-winner'); } } diff --git a/app/Mail/RemindCreator.php b/app/Mail/RemindCreator.php index af35fbf33..338f146a6 100644 --- a/app/Mail/RemindCreator.php +++ b/app/Mail/RemindCreator.php @@ -33,7 +33,7 @@ public function __construct ($user) public function build() { return $this - ->subject("[CodeWeekEU] Your feedback and your certificate of recognition") + ->subject("[EU Code Week] Your feedback and your certificate of recognition") ->markdown('emails.en.remind-creator'); } } diff --git a/resources/latex/images/super-organiser-2023.jpg b/resources/latex/images/super-organiser-2023.jpg deleted file mode 100644 index 7056a2eca..000000000 Binary files a/resources/latex/images/super-organiser-2023.jpg and /dev/null differ diff --git a/resources/latex/images/super-organiser-2023.png b/resources/latex/images/super-organiser-2023.png new file mode 100644 index 000000000..f29bd3c7a Binary files /dev/null and b/resources/latex/images/super-organiser-2023.png differ diff --git a/resources/latex/super-organiser-2023.tex b/resources/latex/super-organiser-2023.tex new file mode 100644 index 000000000..d6585f934 --- /dev/null +++ b/resources/latex/super-organiser-2023.tex @@ -0,0 +1,91 @@ +\documentclass[12pt]{article} +\usepackage[T2A,T1]{fontenc} +\usepackage[utf8]{inputenc} +\usepackage[greek,russian,english]{babel} +\usepackage{mathpazo} +\renewcommand{\familydefault}{\sfdefault} +\usepackage[landscape,a4paper]{geometry} +\geometry{verbose,tmargin=0cm,bmargin=0cm,lmargin=3cm,rmargin=3cm} +\usepackage{fancybox} +\usepackage{calc} +\usepackage{multicol} +\usepackage{graphicx} +\usepackage{url} +\usepackage{eso-pic} +\usepackage{textcomp} +\usepackage{paratype} +\usepackage{tgpagella} + +\usepackage{substitutefont} +\substitutefont{T2A}{\rmdefault}{PTSerif-TLF} + +\definecolor{myblue}{RGB}{40, 53, 131} + +\newcommand\BackgroundPic{% +\put(0,0){% +\parbox[b][\paperheight]{\paperwidth}{% +\vfill +\centering +\includegraphics[width=\paperwidth,height=\paperheight,% +keepaspectratio]{images/super-organiser-2023.png}% +\vfill +}}} + + +\begin{document} +\AddToShipoutPicture{\BackgroundPic} +~ +\vspace{2.2cm} +~ +\begin{center} + +\vspace{6.7cm} + +{\centering\Huge\ +\hspace{-0.9cm} +\begin{otherlanguage*}{russian} +\textcolor{myblue}{} +\end{otherlanguage*} +\par} + +\vspace{1.3cm} + +{\centering\Large\ +\hspace{-0.9cm} +\begin{otherlanguage*}{russian} +\textbf{ coding activities in 2023} +\end{otherlanguage*} +\par} + +\vspace{4.8cm} + +{\centering\normalsize\ +\hspace{-0.9cm} +\begin{otherlanguage*}{russian} +\textcolor{black}{Brussels, } +\end{otherlanguage*} +\par} + +\begin{table}[h] +\footnotesize +\begin{center} + +\end{center} +\end{table} + +\vspace{-3cm} +\end{center} +\begin{table}[h] +\footnotesize +\begin{center} +\begin{tabular}{lr} +%~\hspace{0.7cm} +\end{tabular} +\end{center} +\end{table} +\vspace{-2.2cm} +\begin{center} +%\end{tabular} + +\end{center} +\end{document} diff --git a/resources/latex/super-organiser_greek-2023.tex b/resources/latex/super-organiser_greek-2023.tex new file mode 100644 index 000000000..ae9a9701e --- /dev/null +++ b/resources/latex/super-organiser_greek-2023.tex @@ -0,0 +1,90 @@ +\documentclass[12pt]{article} +\usepackage[T1,LGR,T2A]{fontenc} +\usepackage[utf8]{inputenc} +\usepackage[greek,russian,english]{babel} +\usepackage{mathpazo} +\renewcommand{\familydefault}{\sfdefault} +\usepackage[landscape,a4paper]{geometry} +\geometry{verbose,tmargin=0cm,bmargin=0cm,lmargin=3cm,rmargin=3cm} +\usepackage{fancybox} +\usepackage{calc} +\usepackage{multicol} +\usepackage{graphicx} +\usepackage{url} +\usepackage{eso-pic} +\usepackage{textcomp} +\usepackage{paratype} +\usepackage{tgpagella} + +\usepackage{substitutefont} +\substitutefont{T2A}{\rmdefault}{PTSerif-TLF} +\substitutefont{LGR}{\rmdefault}{udidot} + +\definecolor{myblue}{RGB}{40, 53, 131} + +\newcommand\BackgroundPic{% +\put(0,0){% +\parbox[b][\paperheight]{\paperwidth}{% +\vfill +\centering +\includegraphics[width=\paperwidth,height=\paperheight,% +keepaspectratio]{images/super-organiser-2023.png}% +\vfill +}}} + + +\begin{document} +\AddToShipoutPicture{\BackgroundPic} +~ +\vspace{2.2cm} +~ +\begin{center} + +\vspace{6.7cm} + +{\centering\Huge\ +\begin{otherlanguage*}{greek} +\textcolor{myblue}{} +\end{otherlanguage*} +\par} + +\vspace{1.3cm} + +{\centering\Large\ +\hspace{-0.9cm} +\begin{otherlanguage*}{greek} +\textbf{ coding activities in 2023} +\end{otherlanguage*} +\par} + +\vspace{4.8cm} + +{\centering\normalsize\ +\begin{otherlanguage*}{greek} +\textcolor{black}{Βρυξέλλες, } +\end{otherlanguage*} +\par} + +\begin{table}[h] +\footnotesize +\begin{center} + +\end{center} +\end{table} + +\vspace{-3cm} +\end{center} +\begin{table}[h] +\footnotesize +\begin{center} +\begin{tabular}{lr} +%~\hspace{0.7cm} +\end{tabular} +\end{center} +\end{table} +\vspace{-2.2cm} +\begin{center} +%\end{tabular} + +\end{center} +\end{document} diff --git a/resources/views/emails/en/notify-super-organiser.blade.php b/resources/views/emails/en/notify-super-organiser.blade.php index bb587ce7d..079c9591a 100644 --- a/resources/views/emails/en/notify-super-organiser.blade.php +++ b/resources/views/emails/en/notify-super-organiser.blade.php @@ -1,9 +1,9 @@ @component('mail::message') -Dear Code Week activity organiser, +Dear EU Code Week activity organiser, -We are delighted to let you know that you successfully completed the 2022 Code Week Super Organiser Challenge.
+We are delighted to let you know that you successfully completed the 2023 EU Code Week Super Organiser Challenge.
-That is organising 10 or more Code Week activities in 2022. Congratulations and thank you for playing a major part in last year’s Code Week.
+That is organising 10 or more EU Code Week activities in 2023. Congratulations and thank you for playing a major part in last year’s EU Code Week.
We believe it is vital to bring coding, computing and computational thinking to as many people as possible – and you have helped up us reach this goal!