various

projects/forms.py

@@ -182,7 +182,7 @@ class RealtyForm(forms.ModelForm):
 
 
 class PortfolioForm(forms.ModelForm):
-    duplicate = forms.BooleanField(required=False,label='Some label here')
+    duplicate = forms.BooleanField(required=False, label='Some label here')
     images_ids = forms.CharField(required=True)
 
     class Meta:

projects/models.py

@@ -287,7 +287,7 @@ class Portfolio(models.Model):
     budget = models.DecimalField(max_digits=10, decimal_places=0, default=0, null=True, blank=True)
     building_classification = models.ForeignKey(BuildingClassfication, related_name='portfolios', null=True, blank=True)
     construction_type = models.ForeignKey(ConstructionType, related_name='portfolios', null=True, blank=True)
-    created = models.DateTimeField(default=timezone.now)
+    created = models.DateTimeField(default=timezone.now, auto_now_add=True, auto_created=True)
     currency = models.CharField(max_length=20, default='rur', choices=CURRENCIES, null=True, blank=True)
     description = models.TextField()
     location = TreeForeignKey('common.Location', related_name='portfolios', null=True, blank=True)
@@ -303,13 +303,13 @@ class Portfolio(models.Model):
 
     def get_prev(self):
         try:
-            return self.get_previous_by_created()
+            return self.get_previous_by_created(user=self.user)
         except self.DoesNotExist:
             return None
 
     def get_next(self):
         try:
-            return self.get_next_by_created()
+            return self.get_next_by_created(user=self.user)
         except self.DoesNotExist:
             return None
 

templates/partials/footer.html

@@ -19,6 +19,7 @@
     <div class="col-lg-3 col-lg-offset-2 listF1">
         <p>Профиль</p>
         <ul>
+            {% if not request.user.is_authenticated %}
             <li>
                 <a href="{% url 'auth_login' %}">Войти</a>
             </li>
@@ -30,10 +31,17 @@
             <li>
                 <a href="{% url 'password_reset_recover' %}">Востановить доступ</a>
             </li>
-            
+            {% else %}
-            <li>
+              {% if request.user.is_customer %}
-                <a href="{% url 'projects:customer-project-create' %}">Опубликовать проект</a>
+                <li>
-            </li>
+                    <a href="{% url 'projects:customer-project-create' %}">Опубликовать проект</a>
+                </li>
+              {% else %}
+                <li>
+                  <a href="{% url 'users:contractor-office' pk=request.user.pk %}">Мой офис</a>
+                </li>
+              {% endif %}
+            {% endif %}
         </ul>
     </div>
     

users/templates/contractor_filter.html

@@ -142,7 +142,7 @@
                                 type="submit"
                                 name="{{ form.party_types.html_name }}"
                                 value="{{ val }}"
-                                class="{% if val == last_party_types %}active{% endif %} btn btn-default">
+                                class="{% if val == last_party_types or not last_party_types and val == 'all' %}active{% endif %} btn btn-default">
                                     {{ text }}
                             </button>
                         {% endfor %}

work_sell/models.py

@@ -16,8 +16,8 @@ class WorkSell(models.Model):
     budget = models.DecimalField(max_digits=10, decimal_places=0, default=0, null=True, blank=True)
     building_classification = models.ForeignKey(BuildingClassfication, related_name='worksells', null=True, blank=True)
     construction_type = models.ForeignKey(ConstructionType, related_name='worksells', null=True, blank=True)
-    contractor = models.ForeignKey(User, related_name='work_sell', null=True, blank=True) # TODO: Pluralize related name
+    contractor = models.ForeignKey(User, related_name='work_sell', null=True, blank=True)  # TODO: Pluralize related name
-    created = models.DateTimeField(default=timezone.now)
+    created = models.DateTimeField(default=timezone.now, auto_now_add=True)
     currency = models.CharField(max_length=20, default='rur', choices=CURRENCIES, null=True, blank=True)
     description = models.TextField(blank=True)
     location = TreeForeignKey('common.Location', related_name='worksells', null=True, blank=True)
@@ -35,13 +35,13 @@ class WorkSell(models.Model):
 
     def get_prev(self):
         try:
-            return self.get_previous_by_created()
+            return self.get_previous_by_created(contractor=self.contractor)
         except self.DoesNotExist:
             return None
 
     def get_next(self):
         try:
-            return self.get_next_by_created()
+            return self.get_next_by_created(contractor=self.contractor)
         except self.DoesNotExist:
             return None