61 agregar un link que vaya a la página de administración de ofertas (#549)

* Added pytest as a runner

* Added pytest as a runner on Makefile

* Added joboffers app

* Some fixes to the JobOffer model

* Added initial joboffer detail

* Added initial job offer add form

* Changed joboffer's urls to use their namespace

* Added some basic pytest's fixtures

* Updated JobOffer's factory to include all the needed fields

* Added joboffer creation test

* Added joboffer admin page

* Moved add button to bottom of the page (joboffers)

* Added search button in admin page (joboffers)

* Added joboffer edit view

* Changed joboffer's choices to their long version

* Added link to joboffers admin page and company association to logged users.

* Added missing template file

Co-authored-by: Juan Manuel Schillaci <[email protected]>
Co-authored-by: Ian Puchetti <[email protected]>

Author: 3 people

joboffers/templates/joboffers/_tags_filtering_form.html

@@ -45,5 +45,9 @@ <h4>
 {% endblock %}
 
 {% block right-column %}
-  {% include "joboffers/_tags_filtering_form.html" %}
+  {% if user.is_authenticated %}
+    {% include "companies/_user_actions.html" %}
+  {% endif %}
+
+  {% include "_tags_filtering_form.html" %}
 {% endblock %}

joboffers/templates/joboffers/joboffer_list.html

@@ -729,6 +729,54 @@ def test_JobOfferHistoryView_renders_with_context(
     ]
 
 
+@pytest.mark.django_db
+def test_joboffer_list_view_includes_user_and_own_company_for_publisher(publisher_client):
+    """
+    Test that the joboffer list view includes user and own_company in the companies for a publisher
+    """
+    client = publisher_client
+    JobOfferFactory.create(state=OfferState.ACTIVE)
+
+    target_url = reverse(LIST_URL)
+
+    response = client.get(target_url)
+
+    assert response.context_data['user'].is_authenticated
+    assert response.context_data['own_company']
+
+
+@pytest.mark.django_db
+def test_joboffer_list_view_includes_user_and_own_company_for_user_without_company(logged_client):
+    """
+    Test that the joboffer list view includes user and own_company in the companies for user
+    without company
+    """
+    client = logged_client
+    JobOfferFactory.create(state=OfferState.ACTIVE)
+
+    target_url = reverse(LIST_URL)
+
+    response = client.get(target_url)
+
+    assert response.context_data['user'].is_authenticated
+    assert 'own_company' not in response.context_data
+
+
+@pytest.mark.django_db
+def test_joboffer_list_view_includes_user_and_own_company_for_unlogged_user(client):
+    """
+    Test that the joboffer list view includes user and own_company for anonymous user
+    """
+    JobOfferFactory.create(state=OfferState.ACTIVE)
+
+    target_url = reverse(LIST_URL)
+
+    response = client.get(target_url)
+
+    assert response.context_data['user'].is_anonymous
+    assert 'own_company' not in response.context_data
+
+
 @pytest.mark.django_db
 def test_joboffer_list_view_render_list_with_an_active_joboffer(publisher_client):
     """

joboffers/tests/test_views.py

@@ -429,6 +429,12 @@ def get_context_data(self, **kwargs):
         if self.request.GET.get('search'):
             context['search'] = self.request.GET.get('search')
 
+        context['user'] = self.request.user
+
+        user_company = UserCompanyProfile.objects.for_user(user=self.request.user)
+        if user_company:
+            context['own_company'] = user_company.company
+
         self.context = context
 
         return context

joboffers/views.py

@@ -17,6 +17,7 @@
 USER_ASSOCIATED_CORRECTLY = 'Le usuarie fue asociade correctamente.'
 
 ADMIN_URL = reverse('companies:admin')
+COMPANY_LIST_URL = reverse('companies:company_list_all')
 
 
 def get_plain_messages(request):
@@ -375,3 +376,42 @@ def test_get_user_display_name_with_first_name_and_last_name():
     actual_name = get_user_display_name(user)
 
     assert actual_name == f"{user.first_name} {user.last_name}"
+
+
+@pytest.mark.django_db
+def test_company_list_view_includes_user_and_own_company_for_publisher(publisher_client):
+    """
+    Test that the company list view includes user and own_company in the companies for a publisher
+    """
+    client = publisher_client
+
+    response = client.get(COMPANY_LIST_URL)
+
+    assert response.context_data['user'].is_authenticated
+    assert 'own_company' in response.context_data
+
+
+@pytest.mark.django_db
+def test_company_list_view_includes_user_and_own_company_for_user_without_company(logged_client):
+    """
+    Test that the company list view includes user and own_company in the companies for user
+    without company
+    """
+    client = logged_client
+
+    response = client.get(COMPANY_LIST_URL)
+
+    assert response.context_data['user'].is_authenticated
+    assert 'own_company' not in response.context_data
+
+
+@pytest.mark.django_db
+def test_company_list_view_includes_user_and_own_company_for_unlogged_user(client):
+    """
+    Test that the company list view includes user and own_company for anonymous user
+    """
+
+    response = client.get(COMPANY_LIST_URL)
+
+    assert response.context_data['user'].is_anonymous
+    assert 'own_company' not in response.context_data

pycompanies/tests/test_views.py

@@ -48,6 +48,9 @@ def get_queryset(self):
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
+
+        context['user'] = self.request.user
+
         user_company = UserCompanyProfile.objects.for_user(user=self.request.user)
         if self.request.user.is_anonymous is False and user_company:
             context['own_company'] = user_company.company

pycompanies/views.py

@@ -659,3 +659,14 @@ div.sponsored_jobs {
   background-color: #33681e;
   border-color: #558b2f;
 }
+
+.my-actions .list-group-item {
+  background-color: #F6DDCC;
+  color: ;
+}
+
+.my-actions .list-group-item-heading {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}

static/css/styles.css

@@ -0,0 +1,36 @@
+{% load i18n %}
+<div class="list-group my-actions">
+  {% if own_company %}
+    <div class="list-group-item">
+      <div class="h4 list-group-item-heading flex-center">
+        <span>{{ own_company.name }}</span>
+        <span class="pull-right">
+          <i class="fa fa-building" style="font-size: 1.5em;"></i>
+        </span>
+      </div>
+    </div>
+
+    <div class="list-group-item">
+      <a href="{% url 'joboffers:admin' %}" class="btn btn-default">
+        {% trans 'Administrar Ofertas' %}
+      </a>
+      <a href="{% url 'companies:analytics' own_company.id %}" class="btn btn-dark-green">
+        {% trans 'Analítica de Ofertas' %}
+      </a>
+    </div>
+  {% else %}
+    <div class="list-group-item">
+      <div class="h4 list-group-item-heading flex-center">
+        <span>{{ user.username }}</span>
+        <span class="pull-right">
+          <i class="fa fa-user" style="font-size: 1.5em;"></i>
+        </span>
+      </div>
+    </div>
+    <div class="list-group-item">
+      <a href="{% url 'companies:admin' %}" class="btn btn-default btn-md">
+        {% trans 'Asociarme a Empresa' %}
+      </a>
+    </div>
+  {% endif %}
+</div>

templates/companies/_user_actions.html

@@ -37,30 +37,11 @@ <h3>
 {% endblock %}
 
 {% block right-column %}
-  <section class="list-group">
-    <header class="list-group-item">
-        <h4 class="list-group-item-heading" style="color: #35679a;">
-          {% if own_company %}
-            {% trans 'Estás asociade a la empresa' %}
-            <span style="color:#428bca;">{{own_company}}</span>
-          {% else %}
-            {% trans 'No estás asociade a ninguna empresa' %}
-          {% endif %}
-        </h4>
-    </header>
-    <article class="list-group-item">
-          {% if own_company %}
-            <a href="{% url 'companies:admin' %}" class="btn btn-default btn-md">
-              {% trans 'Administrar ' %}
-            </a>
-            {% else %}
-            <a href="{% url 'companies:association_list' %}" class="btn btn-default btn-md">
-              {% trans 'Administrar' %}
-            </a>
-          {% endif %}
-        <div class="clearfix"></div>
-    </article>
-  </section>
+  {% if user.is_authenticated %}
+    {% include "companies/_user_actions.html" %}
+  {% endif %}
+
   {{ block.super }}
+
   {% include "_tags_filtering_form.html" %}
 {% endblock %}