From 2f75b0779a5d77078ead24eef7d647babadf4e2b Mon Sep 17 00:00:00 2001
From: Norm Rasmussen <norman.rasmussen@me.com>
Date: Mon, 3 Jun 2024 17:27:33 -0400
Subject: [PATCH] Luminate templates mostly. Cin7 too.

---
 .../_sub_navigation.html.liquid               |  4 +-
 .../_cards_course.html.liquid                 |  5 +-
 ...gn_up_follow_up_roles_dropdown.html.liquid |  2 +-
 .../_cards_course.html.liquid                 | 55 +++++++++++++------
 .../_cards_course_ongoing.html.liquid         | 24 +++++---
 .../dashboard.html.liquid                     |  2 +
 .../homepage.html.liquid                      |  5 +-
 Todos.md                                      |  5 ++
 8 files changed, 72 insertions(+), 30 deletions(-)

diff --git a/Custom_Templates/customer_templates/Cin7 Customers/_sub_navigation.html.liquid b/Custom_Templates/customer_templates/Cin7 Customers/_sub_navigation.html.liquid
index 46af698b..20b86c73 100644
--- a/Custom_Templates/customer_templates/Cin7 Customers/_sub_navigation.html.liquid	
+++ b/Custom_Templates/customer_templates/Cin7 Customers/_sub_navigation.html.liquid	
@@ -20,11 +20,11 @@
 <script>
     document.addEventListener("DOMContentLoaded", () => {
       let link = document.getElementById('courses-category');
-      
+
       if (window.location.pathname == '/app/courses-category') {
         link.classList.add("np-sub-navigation-content-item-active");
       } else {
         link.classList.remove("np-sub-navigation-content-item-active");
       }
   });
-</script>
\ No newline at end of file
+</script>
diff --git a/Custom_Templates/customer_templates/Cin7 Internal Academy/_cards_course.html.liquid b/Custom_Templates/customer_templates/Cin7 Internal Academy/_cards_course.html.liquid
index 732409f8..1206c2a7 100644
--- a/Custom_Templates/customer_templates/Cin7 Internal Academy/_cards_course.html.liquid	
+++ b/Custom_Templates/customer_templates/Cin7 Internal Academy/_cards_course.html.liquid	
@@ -8,7 +8,10 @@
         class="learning-path-card-image"
       />
       {% if course.ribbon %}
-        <div class="np-card-ribbon" {% if course.ribbon == "Omni" %} style="background: #0026b2;"{% endif %}>
+		<div class="np-card-ribbon" {% if course.ribbon == "Omni" %} style="background: #0026b2;"
+								    {% elsif course.ribbon == "Core"%} style="background: #05CBBF"
+								    {% else %} style="background: #213343"
+								  {% endif %}>
           {{ course.ribbon }}
         </div>
       {% endif %}
diff --git a/Custom_Templates/customer_templates/Sandata Learn/_sign_up_follow_up_roles_dropdown.html.liquid b/Custom_Templates/customer_templates/Sandata Learn/_sign_up_follow_up_roles_dropdown.html.liquid
index 98ddf1bc..f0da82f7 100644
--- a/Custom_Templates/customer_templates/Sandata Learn/_sign_up_follow_up_roles_dropdown.html.liquid	
+++ b/Custom_Templates/customer_templates/Sandata Learn/_sign_up_follow_up_roles_dropdown.html.liquid	
@@ -9,5 +9,5 @@
 	<option class="second-login-role-option" value="EVV Agency Admin/Manager">Agency Admin/Manager</option>
 	<option class="second-login-role-option" value="EVV Agency Staff">Agency Staff</option>
 	<option class="second-login-role-option" value="Alt-EVV User (Aggregator)">Alt-EVV User (Aggregator)</option>
-	<option class="second-login-role-option" value="Caregiver">Caregiver</option>
+	{% comment %}	<option class="second-login-role-option" value="Caregiver">Caregiver</option> {% endcomment %}
 </select>
diff --git a/Custom_Templates/customer_templates/Walmart Luminate Mexico/_cards_course.html.liquid b/Custom_Templates/customer_templates/Walmart Luminate Mexico/_cards_course.html.liquid
index 274c90ea..feaf48e1 100644
--- a/Custom_Templates/customer_templates/Walmart Luminate Mexico/_cards_course.html.liquid	
+++ b/Custom_Templates/customer_templates/Walmart Luminate Mexico/_cards_course.html.liquid	
@@ -28,33 +28,54 @@
             <div class="course-length">{{course.properties.course_length}}</div>
           {% endif %}
         </div>
-         
+
       {% else %}
         <div></div>
       {% endif %}
-      <div class="np-card-content-footer">   
+      <div class="np-card-content-footer">
         <div class="np-card-content-progress np-button-color">
-        {% if course.progress > 0 and course.progress < 100 %}
-          {{course.progress }}% Completo 
-        {% elsif course.progress == 100 %}
-          {{course.progress }}% Completo 
-        {% else %}
-          No empezado
-        {% endif %}
-          
+		  {% if current_person.properties.language == "en" %}
+			{% if course.progress > 0 and course.progress < 100 %}
+			  {{course.progress }}% Complete
+			{% elsif course.progress == 100 %}
+			  {{course.progress }}% Complete
+			{% else %}
+			  Not Started
+			{% endif %}
+		  {% elsif current_person.properties.language == "es" %}
+			{% if course.progress > 0 and course.progress < 100 %}
+			  {{course.progress }}% Completo
+			{% elsif course.progress == 100 %}
+			  {{course.progress }}% Completo
+			{% else %}
+			  No empezado
+			{% endif %}
+			{% endif %}
+
         </div>
         {% capture course_path %}{% route course, id: course.id %}{% endcapture %}
         {% if course.has_to_restart? %}
           {% include "course_version_outdated_popup", path: course_path %}
         {% endif %}
         <a class="np-button np-button-wide" href="{{ course_path }}">
-          {% if course.progress > 0 and course.progress < 100 %}
-            Continue 
-          {% elsif course.progress == 100 %}
-            Retake
-          {% else %}
-            View
-          {% endif %}
+		  {% if current_person.properties.language == "en" %}
+			{% if course.progress > 0 and course.progress < 100 %}
+			  Continue
+			{% elsif course.progress == 100 %}
+			  Retake
+			{% else %}
+			  View
+			{% endif %}
+		  {% elsif current_person.properties.language == "es" %}
+			{% if course.progress > 0 and course.progress < 100 %}
+			  Continuar
+			{% elsif course.progress == 100 %}
+			  Repetir
+			{% else %}
+			  Vista
+			{% endif %}
+		  {% endif %}
+
         </a>
       </div>
     </div>
diff --git a/Custom_Templates/customer_templates/Walmart Luminate Mexico/_cards_course_ongoing.html.liquid b/Custom_Templates/customer_templates/Walmart Luminate Mexico/_cards_course_ongoing.html.liquid
index bcfeffa1..09a5a535 100644
--- a/Custom_Templates/customer_templates/Walmart Luminate Mexico/_cards_course_ongoing.html.liquid	
+++ b/Custom_Templates/customer_templates/Walmart Luminate Mexico/_cards_course_ongoing.html.liquid	
@@ -24,13 +24,23 @@
       </div>
       <div class="np-card-content-footer">
         <div class="np-card-content-progress np-button-color">
-          {% if course.progress > 0 and course.progress < 100 %}
-          {{course.progress }}% Completo 
-        {% elsif course.progress == 100 %}
-          {{course.progress }}% Completo 
-        {% else %}
-          No empezado
-        {% endif %}
+		  {% if current_person.properties.language == "es" %}
+			{% if course.progress > 0 and course.progress < 100 %}
+			{{course.progress }}% Completo
+		  {% elsif course.progress == 100 %}
+			{{course.progress }}% Completo
+		  {% else %}
+			No empezado
+		  {% endif %}
+		  {% elsif current_person.properties.language == "en" %}
+			{% if course.progress > 0 and course.progress < 100 %}
+			{{course.progress }}% Complete
+		  {% elsif course.progress == 100 %}
+			{{course.progress }}% Complete
+		  {% else %}
+			Not Started
+		  {% endif %}
+		  {% endif %}
         </div>
         <div class="np-card-progress-bar-container">
           <div style="width: {{ course.progress }}%" class="np-button-background-color np-card-progress-bar">
diff --git a/Custom_Templates/customer_templates/Walmart Luminate Mexico/dashboard.html.liquid b/Custom_Templates/customer_templates/Walmart Luminate Mexico/dashboard.html.liquid
index f88059ec..51cf41c4 100644
--- a/Custom_Templates/customer_templates/Walmart Luminate Mexico/dashboard.html.liquid	
+++ b/Custom_Templates/customer_templates/Walmart Luminate Mexico/dashboard.html.liquid	
@@ -4,12 +4,14 @@
 <main class="np-main np-dashboard np-subpage-container np-max-width">
   <div class="row np-flex-center">
     <div class="col-xs-12 col-sm-8">
+	  {% comment %}
       {% if features.learning_paths? %}
         <div class="Learning Paths np-dashboard-resources-title">
           {% t shared.learning_paths %}
         </div>
         {% include "learning_paths_index", items: learning_paths.enrolled %}
       {% endif %}
+	  {% endcomment %}
       <div class="Courses np-dashboard-resources-title">
         {% t shared.course_vocabulary.plural, key: current_school.course_vocabulary %}
       </div>
diff --git a/Custom_Templates/customer_templates/Walmart Luminate Mexico/homepage.html.liquid b/Custom_Templates/customer_templates/Walmart Luminate Mexico/homepage.html.liquid
index e9f39fe7..0dfcf888 100644
--- a/Custom_Templates/customer_templates/Walmart Luminate Mexico/homepage.html.liquid	
+++ b/Custom_Templates/customer_templates/Walmart Luminate Mexico/homepage.html.liquid	
@@ -113,6 +113,7 @@
 
   {% include "homepage_featured", items: catalog_courses %}
 
+  {% comment %}
   <div class="np-max-width np-homepage-row-wrapper">
     <div class="row">
       <div class="col-xs-12 col-sm-12 col-md-12" style="display:flex; flex-direction:column;">
@@ -151,7 +152,7 @@
 
             {% endif %}
           </div>
-
+		  {% endcomment %}
         </div>
       </div>
       {% comment %} {% if features.training_events? %}
@@ -178,7 +179,7 @@
 
   {% include "homepage_ongoing_training", items: catalog_courses %}
 
-  {% include "homepage_topics" %}
+  {% comment %} {% include "homepage_topics" %} {% endcomment %}
   <button
     type="button"
     class="popup-trigger"
diff --git a/Todos.md b/Todos.md
index 3cd3e097..0e5aa56d 100644
--- a/Todos.md
+++ b/Todos.md
@@ -327,3 +327,8 @@ message](https://northpasshq.slack.com/archives/C04RER4PH09/p1709147957374999?th
 
 - [ ] Anthology - Intro Jessica (CAM) for Spanish Academy
 - [X] DoorDash - Intro Barb for PS CSQL.
+
+## 06-03-2024
+
+- [ ] Cin7 - Catalog Filters showing both Core and Omni despite learner only in one group
+- [ ] Cin7 - Badges still duplicating