From 3e2cc8c3488ac4bfb94f4621445f58ac9ed1f97f Mon Sep 17 00:00:00 2001
From: Mukhtar <dagdahzub@mail.ru>
Date: Tue, 26 Jul 2016 19:53:11 +0300
Subject: [PATCH] #ARC-18 Add stages and update stages for customer

---
 api/views.py                            |   7 +-
 archilance/settings/base.py             |   3 +-
 chat/templates/chat_customer.html       | 133 ++++++++++++++++--------
 chat/templates/test1.html               |  41 ++++++--
 chat/views.py                           |   4 +-
 projects/serializers.py                 |  11 ++
 users/templates/contractor_profile.html |   1 +
 7 files changed, 140 insertions(+), 60 deletions(-)

diff --git a/api/views.py b/api/views.py
index 5e5ec84..a8d358d 100755
--- a/api/views.py
+++ b/api/views.py
@@ -1,6 +1,6 @@
 from django.db.models import Q
 from rest_framework.viewsets import ModelViewSet
-
+from rest_framework import permissions
 
 from projects.models import Project, Realty, Stage
 from projects.serializers import ProjectSerializer, RealtySerializer, StageSerializer
@@ -27,6 +27,11 @@ class StageViewSet(ModelViewSet):
     queryset = Stage.objects.all()
     serializer_class = StageSerializer
     filter_class = StageFilterSet
+    permission_classes = (permissions.IsAuthenticatedOrReadOnly,)
+
+    # def put(self, request, *args, **kwargs):
+    #     # import code; code.interact(local=dict(globals(), **locals()))
+    #     return super().update(request, *args, **kwargs)
 
 
 class ProjectViewSet(ModelViewSet):
diff --git a/archilance/settings/base.py b/archilance/settings/base.py
index 8b68b49..79509db 100644
--- a/archilance/settings/base.py
+++ b/archilance/settings/base.py
@@ -238,9 +238,10 @@ REST_FRAMEWORK = {
     
     'DEFAULT_PERMISSION_CLASSES': [
         'rest_framework.permissions.DjangoModelPermissionsOrAnonReadOnly',
+        # 'rest_framework.permissions.DjangoModelPermissions',
     ],
     
-    'PAGE_SIZE': 10,
+    'PAGE_SIZE': 100,
     
     'DEFAULT_FILTER_BACKENDS': ('rest_framework_filters.backends.DjangoFilterBackend',),  # djangorestframework-filters
 }
diff --git a/chat/templates/chat_customer.html b/chat/templates/chat_customer.html
index 5e9c52e..0a9a607 100644
--- a/chat/templates/chat_customer.html
+++ b/chat/templates/chat_customer.html
@@ -156,7 +156,7 @@
                         <div id="message-chat-order-space">
                         </div>
 
-                        <form id="chat-order-add">
+                        <form id="chat-order-add" style="display:none;">
                             <input type="hidden" name="senderId" id="senderId" value="{{ request.user.pk }}"/>
                             <input type="hidden" name="recipentId" id="recipentId" value=""/>
                             <input type="hidden" name="orderId" id="orderId" value=""/>
@@ -174,43 +174,47 @@
 
 
                     </div>
-                    <div class="col-lg-3 wrTAB">
-					<p>Этапы работы</p>
-					<div class="stepssBlock box-sizing disTab">
-						<p class="titleStepss">1 / Согласование условий</p>
-						<p class="textStepss">
-							Обсуджение задания и условий выполнения работы. Подтверждение заказа исполнителем.
-						</p>
-                        <p></p>
-                        <p class="textStepss">
-                            Какое кол-во этапов подразумевает работа? <input type="text" id="countStage" size="3" />
-                        </p>
-
-					</div>
-					<div id="formsetStage" class="numberStepp box-sizing">
-						<div class="insetNumStepp" id="stage1">
-							<p class="titleNumStepp">
-								<span>Этап </span>
-                        </p>
-                            <div class="textAreaBlock2 box-sizing disTab">
-                            <form>
-                                <input type="text" value="Название этапа" />
-                                <input type="text" value="Результат этапа" />
-                                <input type="text" value="Срок этапа" />
-                                <input type="text" value="Цена этапа" />
-                                <input type="text" value="" class="orderStagesInput" />
-                            </form>
+                    <div class="col-lg-3 wrstepschat">
+                        <p>Этапы работы</p>
+                        <div class="stepssBlock box-sizing disTab">
+                            <p class="titleStepss">1 / Согласование условий</p>
+                            <p class="textStepss">
+                                Обсуджение задания и условий выполнения работы. Подтверждение заказа исполнителем.
+                            </p>
+                            <p></p>
+
+                        </div>
+                        <div class="stepssBlock box-sizing disTab">
+                            <p class="textStepss">
+                                Какое кол-во этапов подразумевает работа? <input type="text" id="countStage" size="3"/>
+                            </p>
+                        <div id="formsetStage" class="numberStepp box-sizing" style="display: none;">
+                            <div class="insetNumStepp" id="stage1">
+                                <p class="titleNumStepp">
+                                    <span>Этап </span>
+                                </p>
+                                <div class="textAreaBlock2 box-sizing disTab">
+                                    <form class="new-stages-form">
+                                        <label>Название</label>
+                                            <input type="text" name="name"  />
+                                        <label>Результат</label>
+                                            <input type="text" name="result" />
+                                        <label>Стоимость</label>
+                                            <input type="text" name="cost" />
+                                        <input type="hidden" name="order" class="orderStagesInput"/>
+                                    </form>
+                                </div>
                             </div>
-						</div>
 
-                          <div class="textAreaBlock2 box-sizing disTab">
-                                <a href="javascript:void()">сохранить</a>
+                            <div class="textAreaBlock2 box-sizing disTab">
+                                <a href="javascript:void()" id="addStagesForm">сохранить</a>
                             </div>
-					</div>
+                        </div>
 
-					<div class="textAreaBlock2 FFD box-sizing disTab">
-						<a href="javascript:void()">согласовать</a>
-					</div>
+                        </div>
+                        <div class="textAreaBlock2 FFD box-sizing disTab">
+                            <a href="javascript:void()">согласовать</a>
+                        </div>
 
                         <div id="order-stages"></div>
 
@@ -241,23 +245,48 @@
             var csrftoken = getCookie('csrftoken');
 
 
-            $('#countStage').on('change', function(e){
-                $(".stages_form").each(function(){
+            $("#addStagesForm").on('click',function(){
+               $(".new-stages-form").each(function(i,v){
+                   $.ajax({
+                        url: '/api/stages/',
+                        type: 'POST',
+                        beforeSend: function (xhr) {
+                            xhr.setRequestHeader("X-CSRFToken", getCookie('csrftoken'))
+                        },
+                        data:$(this).serialize(),
+                        dataType: 'json',
+                        success: function (json) {
+                            console.log(json);
+                        },
+                        error: function(e){
+                            console.log(e);
+                        }
+                    });
+
+               });
+            });
+
+            $('#countStage').on('change', function (e) {
+                $(".stages_form").each(function () {
                     $(this).remove();
                 });
                 var countStage = parseInt($(this).val());
                 var limitCount = countStage + 1;
-                for(var i=2;i<limitCount;i++){
-                    var stageCopy = $("#stage1").clone().attr("id","stage" + i).addClass("stages_form");
+                for (var i = 2; i < limitCount; i++) {
+                    var stageCopy = $("#stage1").clone().attr("id", "stage" + i).addClass("stages_form");
                     $("#stage1").after(stageCopy);
                 }
 
             });
 
             $('.order-block').on('click', function () {
-                $('.order-block').each(function(){
-                   $(this).removeClass('orAct');
+                $("#chat-order-add").css("display", "block");
+                $("#formsetStage").css("display","block");
+
+                $('.order-block').each(function () {
+                    $(this).removeClass('orAct');
                 });
+
                 $(this).addClass('orAct');
                 var orderId = $(this).attr('data-id');
                 var recipentId = $(this).attr('data-recipent-id');
@@ -281,8 +310,8 @@
                                 className = '';
                             }
 
-                            inbox.innerHTML += '<div class="col-lg-12 insetCommChat '+ className +'"><div class="topCommChat">' +
-                                    '<p class="nameCommChat">'+ senderName +'</p><span>'+ v.created +'</span></div>' +
+                            inbox.innerHTML += '<div class="col-lg-12 insetCommChat ' + className + '"><div class="topCommChat">' +
+                                    '<p class="nameCommChat">' + senderName + '</p><span>' + v.created + '</span></div>' +
                                     '<p class="textCommChat">' + v.text + '</p></div>';
                         });
                     }
@@ -296,10 +325,22 @@
                     success: function (json) {
                         var htmlInbox = "";
                         $.each(json.results, function (i, v) {
-                            htmlInbox += '<div class="numberStepp box-sizing"><div class="insetNumStepp">' +
-                                    '<p class="titleNumStepp"><span>Этап '+ v.pos +'</span>'+ v.name +'</p>' +
-                                    '<p class="textNumStepp">Результаты этапа:'+ v.result+'</p><div>' +
-                                    '<p>до 16.03.2015</p><span>'+ v.cost +'<i class="fa fa-rub"></i></span></div></div></div>';
+                            if (v.status == "not_agreed") {
+                                htmlInbox += '<div class="numberStepp box-sizing">' +
+                                        '<p>Этап</p><form class="update-stages-form" id="stage-form-'+ v.pos +'">' +
+                                        '<label for="">Название</label><input class="form-control" type="text" value="'+ v.name +'" />' +
+                                        '<label for="">Цена</label><input class="form-control" type="text" value="'+ v.cost +'" />' +
+                                        '<input class="form-control" type="hidden" value="'+ v.order +'" />' +
+                                        '<label for="">Срок</label><input class="form-control" type="text" value="'+ v.term +'" />' +
+                                        '<label for="">Результат</label><input class="form-control" type="text" value="'+ v.result +'" />' +
+                                        '</form></div>';
+                            } else {
+                                htmlInbox += '<div class="numberStepp box-sizing"><div class="insetNumStepp">' +
+                                        '<p class="titleNumStepp"><span>Этап ' + v.pos + '</span>' + v.name + '</p>' +
+                                        '<p class="textNumStepp">Результаты этапа:' + v.result + '</p><div>' +
+                                        '<p>до 16.03.2015</p><span>' + v.cost + '<i class="fa fa-rub"></i></span></div></div></div>';
+
+                            }
                         });
                         $("#order-stages").html(htmlInbox);
                     }
diff --git a/chat/templates/test1.html b/chat/templates/test1.html
index 2531df0..97e9bd9 100644
--- a/chat/templates/test1.html
+++ b/chat/templates/test1.html
@@ -1,10 +1,33 @@
-<h1>Test page </h1>
+{% extends 'partials/base.html' %}
+{% block content %}
+    <h1>Test page </h1>
+{% endblock %}
+{% block js_block %}
+    <script type="text/javascript">
+        $(function () {
 
-<form method="post" action="">
-    {{ formset.management_form }}
-    <table>
-        {% for form in formset %}
-        {{ form }}
-        {% endfor %}
-    </table>
-</form>
+            $.ajax({
+                url: '/api/stages/4/',
+                type: 'PUT',
+                beforeSend: function (xhr) {
+                         xhr.setRequestHeader("X-CSRFToken", getCookie('csrftoken'))
+                },
+
+                data: {
+                    name: 'Test name.HA HA HA nnnnnn ',
+                    cost: 100,
+                    result: 'Результат',
+                    order: 1,
+                },
+                dataType: 'json',
+                success: function (json) {
+                    console.log(json);
+                },
+                error: function(e){
+                    console.log(e);
+                }
+            });
+        });
+    </script>
+
+{% endblock %}
diff --git a/chat/views.py b/chat/views.py
index 1268f22..ed44c24 100644
--- a/chat/views.py
+++ b/chat/views.py
@@ -53,6 +53,4 @@ class ChatUserView(View):
 
 
 def test(request):
-    ArticleFormSet = formset_factory(ArticleForm, extra=2)
-    formset = ArticleFormSet()
-    return render(request, 'test1.html', {'formset': formset})
+    return render(request, 'test1.html')
diff --git a/projects/serializers.py b/projects/serializers.py
index 45cf44a..a9ac96c 100755
--- a/projects/serializers.py
+++ b/projects/serializers.py
@@ -80,6 +80,17 @@ class StageSerializer(ModelSerializer):
         )
 
 
+    # def update(self, inst, validated_data):
+    #     import code; code.interact(local=dict(globals(), **locals()))
+    #     inst.id = validated_data.get('id',inst.id)
+    #     inst.name = validated_data.get('name', inst.name)
+    #     inst.cost = validated_data.get('cost', inst.cost)
+    #     inst.order = validated_data.get('order', inst.order)
+    #     inst.result = validated_data.get('result', inst.result)
+    #     inst.save()
+    #     return inst
+
+
 class ProjectSerializer(ModelSerializer):
     customer = UserSerializer()
     specialization = SpecializationSerializer()
diff --git a/users/templates/contractor_profile.html b/users/templates/contractor_profile.html
index 0cdaa44..606a110 100644
--- a/users/templates/contractor_profile.html
+++ b/users/templates/contractor_profile.html
@@ -287,6 +287,7 @@
                             <div class="col-lg-12 wr-inset-pluss">
                                 <div class="pluss-block">
                                     {{ contractor.contractor_resume.text }}
+
                                 </div>
                                 <div class="gal-pluss">
                                     <div class="inset-gp">