Refactored code

biocodellc · Oct 18, 2023 · 4e4db8e · 4e4db8e
1 parent 8f66723
commit 4e4db8e
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 10 deletions.
diff --git a/institutions/models.py b/institutions/models.py
@@ -71,6 +71,10 @@ def is_user_in_institution(self, user):
         else:
             return False
 
+    def get_distinct_creators(self):
+        project_creators = self.institution_created_project.filter(institution=self).distinct("project__project_creator")
+        return [element.project.project_creator for element in project_creators]
+
     def __str__(self):
         return str(self.institution_name)
 

diff --git a/researchers/models.py b/researchers/models.py
@@ -21,6 +21,9 @@ class Researcher(models.Model):
     orcid_auth_token = models.TextField(null=True, blank=True)
     date_connected = models.DateTimeField(auto_now_add=True, null=True)
 
+    def get_projects(self):
+        return  self.researcher_created_project.filter(researcher=self).exists()
+
     def __str__(self):
         return str(self.user)
 

diff --git a/templates/partials/infocards/_community-card.html b/templates/partials/infocards/_community-card.html
@@ -37,21 +37,18 @@
                         href="{% url 'select-label' community.id %}"                        
                     >View account</a>
                     {% if approved_label %}
-                        {% for collaborator in community.get_collaborator %}
-                            {% if request.user == collaborator %}
-                                <a class="primary-btn action-btn" href="{% url 'community-projects' community.id %}">View account</a>
-                            {% endif %}
-                        {% endfor %}
+                        {% if request.user in community.get_collaborator or request.user == community.community_creator %}
+                            <a class="primary-btn action-btn" href="{% url 'community-projects' community.id %}">View account</a>
+                        {% endif %}
                     {% else %}
                         <a class="primary-btn action-btn" href="{% url 'select-label' community.id %}">View account</a>
                     {% endif %} 
                 {% endif %}
 
-                {% for viewer in community.get_viewers %}
-                    {% if request.user == viewer and approved_label %}
-                        <a class="primary-btn action-btn" href="{% url 'select-label' community.id %}">View account</a>
-                    {% endif %}
-                {% endfor %}
+                {% if request.user in  community.get_viewers and approved_label %}
+                    <a class="primary-btn action-btn" href="{% url 'select-label' community.id %}">View account</a>
+                {% endif %}
+
             </div>
         </div>
 

diff --git a/templates/partials/infocards/_institution-card.html b/templates/partials/infocards/_institution-card.html
@@ -40,10 +40,27 @@
                     {% endif %}
                 {% endif %}
                 {% if '/dashboard/' in request.path %}
+                    <a 
+                    {% if institution_projects %}
+                        {% if request.user in institution.get_distinct_creators  %}
+                            <a 
+                                class="primary-btn action-btn"
+                                href="{% url 'institution-projects' institution.id %}"
+                            >View account</a>
+                        {% else %}
+                            <a 
+                                class="primary-btn action-btn"
+                                href="{% url 'institution-notices' institution.id %}"
+                            >View account</a>
+                        {% endif %}
+
+                    {% else %}
                     <a 
                         class="primary-btn action-btn"
                         href="{% url 'institution-notices' institution.id %}"
                     >View account</a>
+                    >View account</a>
+                    {% endif %}
                 {% endif %}
             </div>
         </div>

diff --git a/templates/partials/infocards/_researcher-card.html b/templates/partials/infocards/_researcher-card.html
@@ -39,10 +39,17 @@
                     {% endif %}
                 {% endif %}
                 {% if '/dashboard/' in request.path %}
+                    {% if researcher.get_projects %}
+                        <a 
+                            class="primary-btn action-btn"
+                            href="{% url 'researcher-projects' researcher.id %}"
+                        >View account</a>
+                    {% else %}
                     <a 
                         class="primary-btn action-btn"
                         href="{% url 'researcher-notices' researcher.id %}"
                     >View account</a>
+                    {% endif %}
                 {% endif %}
             </div>
         </div>