ArturBaybulatov
10 years ago
commit
1c9984f6fb
17 changed files with 416 additions and 49 deletions
@ -0,0 +1,20 @@ |
||||
# -*- coding: utf-8 -*- |
||||
# Generated by Django 1.9.7 on 2016-08-16 13:58 |
||||
from __future__ import unicode_literals |
||||
|
||||
from django.db import migrations, models |
||||
|
||||
|
||||
class Migration(migrations.Migration): |
||||
|
||||
dependencies = [ |
||||
('projects', '0008_auto_20160815_1900'), |
||||
] |
||||
|
||||
operations = [ |
||||
migrations.AddField( |
||||
model_name='project', |
||||
name='is_archive', |
||||
field=models.BooleanField(default=False), |
||||
), |
||||
] |
||||
@ -0,0 +1,24 @@ |
||||
# -*- coding: utf-8 -*- |
||||
# Generated by Django 1.9.7 on 2016-08-16 15:31 |
||||
from __future__ import unicode_literals |
||||
|
||||
from django.db import migrations, models |
||||
|
||||
|
||||
class Migration(migrations.Migration): |
||||
|
||||
dependencies = [ |
||||
('projects', '0009_project_is_archive'), |
||||
] |
||||
|
||||
operations = [ |
||||
migrations.RemoveField( |
||||
model_name='project', |
||||
name='is_archive', |
||||
), |
||||
migrations.AddField( |
||||
model_name='answer', |
||||
name='is_archive', |
||||
field=models.BooleanField(default=False), |
||||
), |
||||
] |
||||
@ -0,0 +1,99 @@ |
||||
{% extends 'partials/base.html' %} |
||||
|
||||
{% load staticfiles %} |
||||
{% load specializtions_tags %} |
||||
{% load thumbnail %} |
||||
|
||||
{% block content %} |
||||
{% include 'partials/header.html' %} |
||||
|
||||
<div class="container mainScore" > |
||||
<div class="row"> |
||||
<div class="col-lg-12"> |
||||
<p class="titleScore">Личный кабинет</p> |
||||
</div> |
||||
{% include 'partials/contractor_profile_tabs.html' with contractor_pk=request.user.pk active='open' all_project_count=projects_count %} |
||||
<div class="buttonGP disTab"> |
||||
<div class="btn-group valProject2" role="group" aria-label="..."> |
||||
<a href="{% url 'users:contractor-office-open-projects' pk=request.user.pk %}" class="btn btn-default">Все</a> |
||||
<a href="{% url 'users:contractor-office-open-projects' pk=request.user.pk %}?owner=private" class="btn btn-default">Личные</a> |
||||
<a href="{% url 'users:contractor-office-open-projects' pk=request.user.pk %}?owner=teams" class="btn btn-default">От именни группы</a> |
||||
</div> |
||||
<div class="btn-group valProject2" role="group" aria-label="..."> |
||||
<button type="button" class="btn btn-default"> |
||||
Открытые проекты |
||||
<span><mark>{{ current_projects_count }}</mark> / <span>{{ projects_count }}</span></span> |
||||
</button> |
||||
<button type="button" class="btn btn-default"> |
||||
Архив |
||||
<span><mark></mark><span>{{ archive_count }}</span></span> |
||||
</button> |
||||
</div> |
||||
</div> |
||||
<div class="projectsBlock disTab"> |
||||
{% for proj in open_projects %} |
||||
<div class="projectPro clearfix"> |
||||
<div class="col-lg-9 leftPro"> |
||||
<a href="{% url 'projects:detail' proj.pk %}"> |
||||
<p class="titlePro"> |
||||
{{ proj }} |
||||
</p> |
||||
</a> |
||||
<ul class="desPro"> |
||||
<li> |
||||
Объект "{{ proj.realty.name }}" |
||||
</li> |
||||
<li> |
||||
<span>0</span> ответ от имени группы |
||||
</li> |
||||
</ul> |
||||
<p class="textPro"> |
||||
</p> |
||||
<ul class="listPro"> |
||||
<li> |
||||
{{ proj.created }} |
||||
</li> |
||||
<li> |
||||
0 |
||||
</li> |
||||
<li> |
||||
0 |
||||
</li> |
||||
<li> |
||||
{{ proj.customer.username }} |
||||
</li> |
||||
</ul> |
||||
</div> |
||||
<div class="col-lg-3 rightPro"> |
||||
<p class="cenaPro"> |
||||
{{ proj.budget }} <i class="fa fa-rub"></i> |
||||
</p> |
||||
<ul> |
||||
{% if proj.cro %} |
||||
<li> |
||||
Безопасная сделка |
||||
</li> |
||||
{% endif %} |
||||
|
||||
<li> |
||||
<form action="{% url 'projects:contractor-answer-archive' %}" method="POST" novalidate> |
||||
{% csrf_token %} |
||||
<input type="hidden" name="next" value="{{ request.path }}"> |
||||
<input type="hidden" name="project_pk" value="{{ proj.pk }}"> |
||||
<input type="hidden" name="user_pk" value="{{ request.user.pk }}"> |
||||
<a href="#" onclick="$(this).closest('form').submit(); return false">Отказаться и переместить в архив</a> |
||||
</form> |
||||
|
||||
</li> |
||||
|
||||
</ul> |
||||
</div> |
||||
</div> |
||||
{% endfor %} |
||||
</div> |
||||
|
||||
|
||||
{% include 'partials/footer.html' %} |
||||
</div> |
||||
</div> |
||||
{% endblock %} |
||||
@ -0,0 +1,98 @@ |
||||
{% extends 'partials/base.html' %} |
||||
|
||||
{% load staticfiles %} |
||||
{% load specializtions_tags %} |
||||
{% load thumbnail %} |
||||
|
||||
{% block content %} |
||||
{% include 'partials/header.html' %} |
||||
|
||||
<div class="container mainScore" > |
||||
<div class="row"> |
||||
<div class="col-lg-12"> |
||||
<p class="titleScore">Личный кабинет</p> |
||||
</div> |
||||
{% include 'partials/contractor_profile_tabs.html' with contractor_pk=request.user.pk active='open' all_project_count=projects_count %} |
||||
<div class="buttonGP disTab"> |
||||
<div class="btn-group valProject2" role="group" aria-label="..."> |
||||
<a href="{% url 'users:contractor-office-open-projects' pk=request.user.pk %}" class="btn btn-default">Все</a> |
||||
<a href="{% url 'users:contractor-office-open-projects' pk=request.user.pk %}?owner=private" class="btn btn-default">Личные</a> |
||||
<a href="{% url 'users:contractor-office-open-projects' pk=request.user.pk %}?owner=teams" class="btn btn-default">От именни группы</a> |
||||
</div> |
||||
<div class="btn-group valProject2" role="group" aria-label="..."> |
||||
<button type="button" class="btn btn-default"> |
||||
Открытые проекты |
||||
<span><mark>{{ current_projects_count }}</mark> / <span>{{ projects_count }}</span></span> |
||||
</button> |
||||
<button type="button" class="btn btn-default"> |
||||
Архив |
||||
<span><mark></mark><span>{{ archive_count }}</span></span> |
||||
</button> |
||||
</div> |
||||
</div> |
||||
<div class="projectsBlock disTab"> |
||||
{% for proj in open_projects %} |
||||
<div class="projectPro clearfix"> |
||||
<div class="col-lg-9 leftPro"> |
||||
<a href="{% url 'projects:detail' proj.pk %}"> |
||||
<p class="titlePro"> |
||||
{{ proj }} |
||||
</p> |
||||
</a> |
||||
<ul class="desPro"> |
||||
<li> |
||||
Объект "{{ proj.realty.name }}" |
||||
</li> |
||||
<li> |
||||
<span>0</span> ответ от имени группы |
||||
</li> |
||||
</ul> |
||||
<p class="textPro"> |
||||
</p> |
||||
<ul class="listPro"> |
||||
<li> |
||||
{{ proj.created }} |
||||
</li> |
||||
<li> |
||||
0 |
||||
</li> |
||||
<li> |
||||
0 |
||||
</li> |
||||
<li> |
||||
{{ proj.customer.username }} |
||||
</li> |
||||
</ul> |
||||
</div> |
||||
<div class="col-lg-3 rightPro"> |
||||
<p class="cenaPro"> |
||||
{{ proj.budget }} <i class="fa fa-rub"></i> |
||||
</p> |
||||
<ul> |
||||
{% if proj.cro %} |
||||
<li> |
||||
Безопасная сделка |
||||
</li> |
||||
{% endif %} |
||||
|
||||
<li> |
||||
<form action="{% url 'projects:contractor-answer-archive' %}" method="POST" novalidate> |
||||
{% csrf_token %} |
||||
<input type="hidden" name="next" value="{{ request.path }}"> |
||||
<input type="hidden" name="project_pk" value="{{ proj.pk }}"> |
||||
<input type="hidden" name="user_pk" value="{{ request.user.pk }}"> |
||||
<a href="#" onclick="$(this).closest('form').submit(); return false">Отказаться и переместить в архив</a> |
||||
</form> |
||||
|
||||
</li> |
||||
|
||||
</ul> |
||||
</div> |
||||
</div> |
||||
{% endfor %} |
||||
</div> |
||||
|
||||
{% include 'partials/footer.html' %} |
||||
</div> |
||||
</div> |
||||
{% endblock %} |
||||
@ -0,0 +1,30 @@ |
||||
<div class="profileTabs"> |
||||
<ul class="nav nav-tabs nav-justified"> |
||||
<li role="presentation"> |
||||
<a href="{% url 'users:contractor-filter' %}">Поиск исполнителей </a> |
||||
</li> |
||||
<li role="presentation" {% if active == 'groups' %}class="active"{% endif %}> |
||||
<a href="{% url 'users:contractor-office' pk=contractor_pk %}" > |
||||
Мои группы |
||||
</a> |
||||
<div class="roundsCount"> |
||||
</div> |
||||
</li> |
||||
<li role="presentation" {% if active == 'open' %}class="active"{% endif %}> |
||||
<a href="{% url 'users:contractor-office-open-projects' pk=contractor_pk %}" >Открытые проекты</a> |
||||
<span class="desPresent"> |
||||
в процессе обсуждения |
||||
</span> |
||||
<div class="roundsCount"> |
||||
<div class="countR">0</div> |
||||
<div class="countG">{{ all_project_count}}</div> |
||||
</div> |
||||
</li> |
||||
<li role="presentation"> |
||||
<a href="{% url 'chat:chat-user' %}">Проекты в работе</a> |
||||
<div class="roundsCount"> |
||||
<div class="countG">0</div> |
||||
</div> |
||||
</li> |
||||
</ul> |
||||
</div> |
||||
Loading…
Reference in new issue