Merge pull request #11 from ruben69695/fix/present-jobs

Added a fix to be able to show the present jobs in experience feature
ruben69695 · Oct 15, 2023 · a314c2b · a314c2b
2 parents 815a31f + 614186e
commit a314c2b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,6 +25,7 @@ share/python-wheels/
 .installed.cfg
 *.egg
 MANIFEST
+.idea
 
 # PyInstaller
 #  Usually these files are written by a python script from a template

diff --git a/experience/templates/experience/experience.html b/experience/templates/experience/experience.html
@@ -21,7 +21,12 @@ <h6 class="card-subtitle fst-light">{{ experience.job.company }}</h6>
 						</div>
 						{% comment %} <p class="card-text">{{ experience.job.description }}</p> {% endcomment %}
                         <p class="card-text">
-                            <small class="text-start">{{ experience.job.from_date }}</small>{% if experience.job.to_date %}<small> - {{ experience.job.to_date }}</small>{% endif %}
+                            <small class="text-start">{{ experience.job.from_date }}</small>
+                            {% if experience.job.to_date %}
+                            <small> - {{ experience.job.to_date }}</small>
+                            {% else %}
+                            <small> - Present</small>
+                            {% endif %}
                         </p>
                     </div>
                     <div class="card-footer experience-footer">

diff --git a/experience/views.py b/experience/views.py
@@ -4,6 +4,7 @@
 
 DAYS_YEAR = 365
 
+
 # Create your views here.
 
 
@@ -16,12 +17,13 @@ def experience(request):
     return render(request, "experience/experience.html", {'experiences': experiences})
 
 
-class ExperienceView():
+class ExperienceView:
 
     def __init__(self, job):
         self.job = job
-        duration = job.to_date - job.from_date if job.to_date else datetime(datetime(
-        ).utcnow().year, datetime().utcnow().month, datetime().utcnow().day) - job.from_date
+        duration = job.to_date - job.from_date if job.to_date else datetime(datetime.utcnow().year,
+                                                                            datetime.utcnow().month,
+                                                                            datetime.utcnow().day).date() - job.from_date
         self.years = int(duration.days / DAYS_YEAR)
         self.months = int(((duration.days / DAYS_YEAR) * 12) -
                           (int(duration.days / DAYS_YEAR) * 12))