diff --git a/projects/templates/comparison.html b/projects/templates/comparison.html index 1181df2..8e4b07e 100644 --- a/projects/templates/comparison.html +++ b/projects/templates/comparison.html @@ -68,15 +68,18 @@
-
- -
+ +
- -
+ +
+
+ {% csrf_token %} +
+
diff --git a/projects/templates/project_detail.html b/projects/templates/project_detail.html index 286c254..7ef1f30 100644 --- a/projects/templates/project_detail.html +++ b/projects/templates/project_detail.html @@ -468,22 +468,15 @@
-

Сравнить кандидатов

+

Сравнить кандидатов

- - - - - - - +

Новые исполнители

- - + {% for answer in project.answers.all %}
diff --git a/projects/urls.py b/projects/urls.py index 60afe07..e99ee89 100644 --- a/projects/urls.py +++ b/projects/urls.py @@ -19,6 +19,7 @@ from .views import ( ProjectDetailWithAnswerView, ProjectFilterView, sort_candidates, + CandidateDeleteView, ) app_name = 'projects' @@ -42,6 +43,7 @@ urlpatterns = [ urls.url(r'^portfolio/(?P\d+)/edit/$', ContractorPortfolioUpdateView.as_view(), name='contractor-portfolio-edit'), urls.url(r'^candidate/add/(?P(\d+))/(?P(\d+))/$', add_candidate, name='add-candidate'), + urls.url(r'^candidate/delete/(?P(\d+))/$', CandidateDeleteView.as_view(), name='delete-candidate'), urls.url(r'^candidate/comparison/sort/$', sort_candidates, name='comparison-sort'), urls.url(r'^candidate/comparison/(?P\d+)/$', ProjectComparisonView.as_view(), name='comparison'), diff --git a/projects/views.py b/projects/views.py index 5b38ed5..6a00b0f 100644 --- a/projects/views.py +++ b/projects/views.py @@ -595,10 +595,21 @@ class ProjectComparisonView(DetailView): def add_candidate(request, answer_id, project_id): answer = Answer.objects.get(pk=answer_id) project = Project.objects.get(pk=project_id) - candidate = Candidate.objects.create(answer=answer, project=project) + count_answers = Candidate.objects.filter(project=project).count() + count_answers += 1 + candidate = Candidate.objects.create(answer=answer, project=project, position=count_answers) return HttpResponseRedirect(reverse('projects:detail', args=[project_id])) +class CandidateDeleteView(DeleteView): + model = Candidate + + def get_success_url(self): + return reverse('projects:comparison', kwargs={'pk': self.object.project_id}) + + def get(self, *args, **kwargs): + return self.post(*args, **kwargs) + def sort_candidates(request): if request.is_ajax(): items = request.POST.getlist('items[]') diff --git a/users/templates/portfolio_create_form.html b/users/templates/portfolio_create_form.html index 540351c..557c16d 100644 --- a/users/templates/portfolio_create_form.html +++ b/users/templates/portfolio_create_form.html @@ -3,115 +3,125 @@
{% csrf_token %}
-

Название{{ portfolio_form.name.errors.as_text }}

+

Название{{ portfolio_form.name.errors.as_text }} +

-

Описание{{ portfolio_form.description.errors.as_text }}

- +

Описание{{ portfolio_form.description.errors.as_text }} +

+

Специализации

-
+
-
- -
+
+ +
-
- -
+
+ +
-
- -
+
+ +
-
- -
-
- + +
+
+ -
+
-

Бюджет{{ portfolio_form.budget.errors.as_text }}

+

Бюджет{{ portfolio_form.budget.errors.as_text }}

- +
- {{ portfolio_form.currency}} + {{ portfolio_form.currency }}
-
+
-

Срок выполнения{{ portfolio_form.budget.errors.as_text }}

+

Срок выполнения{{ portfolio_form.budget.errors.as_text }}

- +
{{ portfolio_form.term_type }}
-
+
+

Вид строительства

-
-

Вид строительства

- {{ portfolio_form.construction_type}} +
+ {{ portfolio_form.construction_type }}
-
-

Классификация здания

- {{ portfolio_form.building_classification}} +
+
+ +
+

Классификация здания

+
+
+ {{ portfolio_form.building_classification }}
-
-

Классификация здания

- {{ portfolio_form.building_classification}} -
+
+

+
+
-
- - - {{ portfolio_form.duplicate }} Дублировать проект в готовые работы -
+ +

Дублировать проект в готовые работы

+
-
- + + +
- -
+ + +
Выберите файлы -
- -
-
- -
-
-
- -
-
-
-
+ +
+
+ +
+
+
+ +
+
+
@@ -123,9 +133,9 @@
- +
- +