Merge freelance projects into work experience

CV-Amin-Kasrou-Aouam-en.yml

@@ -35,10 +35,10 @@ technologies:
 - category: Programming languages
   items:
     - Python
+    - R
     - C++
     - Java
     - PHP
-    - R
 - category: Tools
   items:
     - \LaTeX
@@ -53,13 +53,6 @@ technologies:
     - Android
     - NixOS
 
-freelance:
-- client: Odyfo
-  summary: Development of a REST API
-  description:
-    - "Rewrite of CRUD API that serves mobile apps using Python (FastAPI)"
-    - "Database cleanup and migration to SQLite"
-
 projects:
 - "Telegram bot to notify of COVID-19 cases (Python)"
 - "Declarative configuration of a home server (Nix)"
@@ -75,6 +68,9 @@ languages:
 - language: French
   proficiency: Native
 
+- language: Arabic (Moroccan dialect)
+  proficiency: Native
+
 courses:
 - name: Fundamentals of Robotics
   institution: Adams Formación
@@ -93,12 +89,22 @@ experience:
   years:
     start: "January 2021"
     end: "present"
-  position: Internship
+  position: Freelance
   city: Ceuta
   country: Spain
   description:
     - "System administrator of a regulatory college"
     - "Management of a Linux server, networking equipment and PCs"
+- company: Odyfo
+  years:
+    start: "March 2020"
+    end: "present"
+  position: Freelance
+  city: Remote
+  country: Spain
+  description:
+    - "Rewrite of CRUD API that serves mobile apps using Python (FastAPI)"
+    - "Database cleanup and migration to SQLite"
 - company: JITKey
   years:
     start: "February 2020"

CV-Amin-Kasrou-Aouam-es.yml

@@ -36,10 +36,10 @@ technologies:
 - category: Lenguajes de programación
   items:
     - Python
+    - R
     - C++
     - Java
     - PHP
-    - R
 - category: Herramientas
   items:
     - \LaTeX
@@ -54,13 +54,6 @@ technologies:
     - Android
     - NixOS
 
-freelance:
-- client: Odyfo
-  summary: Desarrollo de una API REST
-  description:
-    - "Reimplementación de una API CRUD para apps móviles usando Python (FastAPI)"
-    - "Limpieza de la base de datos SQL y migración a SQLite"
-
 projects:
 - "Bot de Telegram para la notificación de casos de COVID-19 (Python)"
 - "Configuración declarativa de un servidor (Nix)"
@@ -76,6 +69,9 @@ languages:
 - language: Francés
   proficiency: Nativo
 
+- language: Darija (Dialecto marroquí)
+  proficiency: Nativo
+
 courses:
 - name: Fundamentos de Robótica
   institution: Adams Formación
@@ -93,13 +89,23 @@ experience:
 - company: COACE
   years:
     start: "Enero 2021"
-    end: "present"
-  position: Prácticas
+    end: "presente"
+  position: Freelance
   city: Ceuta
   country: España
   description:
     - "Administrador de sistemas de un colegio oficial"
     - "Gestión de un servidor Linux, hardware de red y PCs"
+- company: Odyfo
+  years:
+    start: "Marzo 2020"
+    end: "presente"
+  position: Freelance
+  city: Remoto
+  country: España
+  description:
+    - "Reimplementación de una API CRUD para apps móviles usando Python (FastAPI)"
+    - "Limpieza de la base de datos SQL y migración a SQLite"
 - company: JITKey
   years:
     start: "Febrero 2020"

assets/template.tex

@@ -88,18 +88,6 @@ $for(experience)$
   \end{tightitems}}
 $endfor$
 
-\ifthenelse{\equal{$lang$}{en}}
-    {\subsection{Freelance projects}}
-    {\subsection{Proyectos freelance}}
-$for(freelance)$
-  \cventry{}{$freelance.summary$}{$freelance.client$}{}{}{
-  \begin{tightitems}
-    $for(freelance.description)$
-      \item{$freelance.description$}
-    $endfor$
-  \end{tightitems}}
-$endfor$
-
 
 \ifthenelse{\equal{$lang$}{en}}
     {\section{Personal Projects}}