From 08b7290070f3bfc0cda089d109574e101d4c6db6 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Tue, 21 Dec 2021 15:54:47 +0530
Subject: [PATCH] fix: display internship in profile

---
 school/fixtures/custom_field.json        | 74 ++++++++++++------------
 school/lms/web_form/profile/profile.json |  6 +-
 school/www/profiles/profile.html         |  5 +-
 3 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/school/fixtures/custom_field.json b/school/fixtures/custom_field.json
index 7c2e7f90..61ac7717 100644
--- a/school/fixtures/custom_field.json
+++ b/school/fixtures/custom_field.json
@@ -30,7 +30,7 @@
   "label": "Country",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2021-12-21 19:14:11.571754",
+  "modified": "2021-12-22 19:14:11.571754",
   "module": null,
   "name": "User-country",
   "no_copy": 0,
@@ -84,7 +84,7 @@
   "label": "Acceptance for Terms of Use",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2021-12-21 19:15:34.932908",
+  "modified": "2021-12-22 19:15:34.932908",
   "module": null,
   "name": "User-verify_terms",
   "no_copy": 0,
@@ -138,7 +138,7 @@
   "label": "City",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2021-12-21 14:46:55.834145",
+  "modified": "2021-12-22 14:46:55.834145",
   "module": null,
   "name": "User-city",
   "no_copy": 0,
@@ -192,7 +192,7 @@
   "label": "College Name",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2021-12-21 14:46:55.834145",
+  "modified": "2021-12-22 14:46:55.834145",
   "module": null,
   "name": "User-college",
   "no_copy": 0,
@@ -246,7 +246,7 @@
   "label": "Branch",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2021-12-21 14:46:55.834145",
+  "modified": "2021-12-22 14:46:55.834145",
   "module": null,
   "name": "User-branch",
   "no_copy": 0,
@@ -300,7 +300,7 @@
   "label": "LinkedIn ID",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2021-12-21 14:46:55.834145",
+  "modified": "2021-12-22 14:46:55.834145",
   "module": null,
   "name": "User-linkedin",
   "no_copy": 0,
@@ -354,7 +354,7 @@
   "label": "Github ID",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2021-12-21 14:46:55.834145",
+  "modified": "2021-12-22 14:46:55.834145",
   "module": null,
   "name": "User-github",
   "no_copy": 0,
@@ -408,7 +408,7 @@
   "label": "Medium ID",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2021-12-21 14:46:55.834145",
+  "modified": "2021-12-22 14:46:55.834145",
   "module": null,
   "name": "User-medium",
   "no_copy": 0,
@@ -462,7 +462,7 @@
   "label": "Profession",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2021-12-21 14:46:55.834145",
+  "modified": "2021-12-22 14:46:55.834145",
   "module": null,
   "name": "User-profession",
   "no_copy": 0,
@@ -516,7 +516,7 @@
   "label": "Education Details",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2021-12-21 11:57:55.170625",
+  "modified": "2021-12-22 11:57:55.170625",
   "module": null,
   "name": "User-education_details",
   "no_copy": 0,
@@ -570,7 +570,7 @@
   "label": "Hide my Private Information from others",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2021-12-21 11:57:47.942967",
+  "modified": "2021-12-22 11:57:47.942967",
   "module": null,
   "name": "User-hide_my_private_information_from_others",
   "no_copy": 0,
@@ -624,7 +624,7 @@
   "label": "Profile Complete",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2021-12-21 11:00:13.792809",
+  "modified": "2021-12-22 11:00:13.792809",
   "module": null,
   "name": "User-profile_complete",
   "no_copy": 0,
@@ -678,7 +678,7 @@
   "label": "Cover Image",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2021-12-21 10:59:52.682112",
+  "modified": "2021-12-22 10:59:52.682112",
   "module": null,
   "name": "User-cover_image",
   "no_copy": 0,
@@ -732,7 +732,7 @@
   "label": "Education",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2021-12-21 11:58:56.052663",
+  "modified": "2021-12-22 11:58:56.052663",
   "module": null,
   "name": "User-education",
   "no_copy": 0,
@@ -786,7 +786,7 @@
   "label": "Work Experience Details",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2021-12-21 11:56:29.466560",
+  "modified": "2021-12-22 11:56:29.466560",
   "module": null,
   "name": "User-work_experience_details",
   "no_copy": 0,
@@ -840,7 +840,7 @@
   "label": "Work Experience",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2021-12-21 11:58:43.329371",
+  "modified": "2021-12-22 11:58:43.329371",
   "module": null,
   "name": "User-work_experience",
   "no_copy": 0,
@@ -878,7 +878,7 @@
   "dt": "User",
   "fetch_from": null,
   "fetch_if_empty": 0,
-  "fieldname": "volunteering_or_internship",
+  "fieldname": "internship",
   "fieldtype": "Table",
   "hidden": 0,
   "hide_border": 0,
@@ -894,9 +894,9 @@
   "label": "Volunteering or Internship",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2021-12-21 14:58:04.285835",
+  "modified": "2021-12-22 14:58:04.285835",
   "module": null,
-  "name": "User-volunteering_or_internship",
+  "name": "User-internship",
   "no_copy": 0,
   "non_negative": 0,
   "options": "Work Experience",
@@ -948,7 +948,7 @@
   "label": "Certification Details",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2021-12-21 14:58:29.975380",
+  "modified": "2021-12-22 14:58:29.975380",
   "module": null,
   "name": "User-certification_details",
   "no_copy": 0,
@@ -1002,7 +1002,7 @@
   "label": "Certification",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2021-12-21 11:59:54.850517",
+  "modified": "2021-12-22 11:59:54.850517",
   "module": null,
   "name": "User-certification",
   "no_copy": 0,
@@ -1056,7 +1056,7 @@
   "label": "Skill Details",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2021-12-21 12:01:29.335323",
+  "modified": "2021-12-22 12:01:29.335323",
   "module": null,
   "name": "User-skill_details",
   "no_copy": 0,
@@ -1110,7 +1110,7 @@
   "label": "Skill",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2021-12-21 15:32:13.944672",
+  "modified": "2021-12-22 15:32:13.944672",
   "module": null,
   "name": "User-skill",
   "no_copy": 0,
@@ -1164,7 +1164,7 @@
   "label": "Career Preference Details",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2021-12-21 15:35:50.764368",
+  "modified": "2021-12-22 15:35:50.764368",
   "module": null,
   "name": "User-carrer_preference_details",
   "no_copy": 0,
@@ -1218,7 +1218,7 @@
   "label": "Preferred Functions",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2021-12-21 17:12:36.454519",
+  "modified": "2021-12-22 17:12:36.454519",
   "module": null,
   "name": "User-preferred_functions",
   "no_copy": 0,
@@ -1272,7 +1272,7 @@
   "label": "Preferred Location",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2021-12-21 17:12:40.105066",
+  "modified": "2021-12-22 17:12:40.105066",
   "module": null,
   "name": "User-preferred_location",
   "no_copy": 0,
@@ -1326,7 +1326,7 @@
   "label": "",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2021-12-21 12:47:32.673594",
+  "modified": "2021-12-22 12:47:32.673594",
   "module": null,
   "name": "User-career_preference_column",
   "no_copy": 0,
@@ -1380,7 +1380,7 @@
   "label": "Preferred Industries",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2021-12-21 17:12:31.604282",
+  "modified": "2021-12-22 17:12:31.604282",
   "module": null,
   "name": "User-preferred_industries",
   "no_copy": 0,
@@ -1434,7 +1434,7 @@
   "label": "Dream Companies",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2021-12-21 12:49:19.295124",
+  "modified": "2021-12-22 12:49:19.295124",
   "module": null,
   "name": "User-dream_companies",
   "no_copy": 0,
@@ -1488,7 +1488,7 @@
   "label": "Work Environment",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2021-12-21 12:49:46.685634",
+  "modified": "2021-12-22 12:49:46.685634",
   "module": null,
   "name": "User-work_environment",
   "no_copy": 0,
@@ -1542,7 +1542,7 @@
   "label": "Attire Preference",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2021-12-21 12:03:02.296214",
+  "modified": "2021-12-22 12:03:02.296214",
   "module": null,
   "name": "User-attire",
   "no_copy": 0,
@@ -1596,7 +1596,7 @@
   "label": "Collaboration Preference",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2021-12-21 12:02:49.680208",
+  "modified": "2021-12-22 12:02:49.680208",
   "module": null,
   "name": "User-collaboration",
   "no_copy": 0,
@@ -1650,7 +1650,7 @@
   "label": "Role Preference",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2021-12-21 16:10:37.349479",
+  "modified": "2021-12-22 16:10:37.349479",
   "module": null,
   "name": "User-role",
   "no_copy": 0,
@@ -1704,7 +1704,7 @@
   "label": "",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2021-12-21 16:45:46.776903",
+  "modified": "2021-12-22 16:45:46.776903",
   "module": null,
   "name": "User-work_environment_column",
   "no_copy": 0,
@@ -1758,7 +1758,7 @@
   "label": "Location Preference",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2021-12-21 12:02:04.328536",
+  "modified": "2021-12-22 12:02:04.328536",
   "module": null,
   "name": "User-location_preference",
   "no_copy": 0,
@@ -1812,7 +1812,7 @@
   "label": "Time Preference",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2021-12-21 16:16:37.885306",
+  "modified": "2021-12-22 16:16:37.885306",
   "module": null,
   "name": "User-time",
   "no_copy": 0,
@@ -1866,7 +1866,7 @@
   "label": "Company Type",
   "length": 0,
   "mandatory_depends_on": null,
-  "modified": "2021-12-21 12:01:41.342622",
+  "modified": "2021-12-22 12:01:41.342622",
   "module": null,
   "name": "User-company_type",
   "no_copy": 0,
diff --git a/school/lms/web_form/profile/profile.json b/school/lms/web_form/profile/profile.json
index 4b882cfe..a91bc666 100644
--- a/school/lms/web_form/profile/profile.json
+++ b/school/lms/web_form/profile/profile.json
@@ -21,7 +21,7 @@
  "is_standard": 1,
  "login_required": 1,
  "max_attachment_size": 0,
- "modified": "2021-12-21 14:58:56.943438",
+ "modified": "2021-12-21 15:50:31.707751",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "profile",
@@ -236,7 +236,7 @@
   },
   {
    "allow_read_on_all_link_options": 0,
-   "fieldname": "volunteering_or_internship",
+   "fieldname": "internship",
    "fieldtype": "Table",
    "hidden": 0,
    "label": "Volunteering or Internship",
@@ -469,4 +469,4 @@
    "show_in_filter": 0
   }
  ]
-}
+}
\ No newline at end of file
diff --git a/school/www/profiles/profile.html b/school/www/profiles/profile.html
index a2751a8f..64e73b81 100644
--- a/school/www/profiles/profile.html
+++ b/school/www/profiles/profile.html
@@ -309,11 +309,12 @@
 {% endmacro %}
 
 {% macro WorkDetails(member) %}
-{% if member.work_experience %}
+{% set work_details = member.work_experience + member.internship %}
+{% if work_details | length %}
 <div class="education-details">
   <div class="course-home-headings"> Work Experience </div>
   <div class="common-card-style profile-card">
-    {% for work in member.work_experience %}
+    {% for work in work_details %}
     <div class="">
       <div class="institute-name"> {{ work.title }} </div>
       <div class="profile-item"> {{ work.company }} </div>