From 08e108152c3ca485969801dd5cf9f206dc9635e5 Mon Sep 17 00:00:00 2001 From: booblegum Date: Fri, 11 Nov 2016 00:16:34 +0300 Subject: [PATCH 1/2] =?UTF-8?q?PR-20=20=D0=94=D0=BE=D1=80=D0=B0=D0=B1?= =?UTF-8?q?=D0=BE=D1=82=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Переработана логика работы фильтра проектов. Доработан дизайн фильтра. --- assets/css/main.css | 6 +- assets/lib/proekton-components/css/other.css | 59 +++-- .../proekton-components/css/select-box.css | 57 ++++- assets/lib/proekton-components/img/rect01.png | Bin 2618 -> 2564 bytes assets/lib/proekton-components/img/rect02.png | Bin 2625 -> 2557 bytes .../lib/proekton-components/js/SelectBox.js | 3 +- .../js/SelectedContainer.js | 4 +- .../proekton-components/js/SimpleSelect.js | 3 +- assets/projects-filter.js | 45 ++++ .../partials/inc-projects-filter.html | 119 ++++++++++ .../partials/inc-projects-results.html | 72 ++++++ .../partials/inc-projects-sort_by.html | 13 ++ projects/templates/project_filter.html | 217 +----------------- projects/views.py | 111 +++++---- templates/partials/ajax_pagination.html | 65 ++++++ 15 files changed, 481 insertions(+), 293 deletions(-) create mode 100644 assets/projects-filter.js create mode 100644 projects/templates/partials/inc-projects-filter.html create mode 100644 projects/templates/partials/inc-projects-results.html create mode 100644 projects/templates/partials/inc-projects-sort_by.html create mode 100644 templates/partials/ajax_pagination.html diff --git a/assets/css/main.css b/assets/css/main.css index 595b0ac..62037d6 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -1329,10 +1329,10 @@ footer:after { } .titleResF1, div p.titleResF1 { - font-size: 15px; + font-size: 14pt; font-family: 'Arial-MT-Regular', sans-serif; - font-weight: bold; - color: #2c2c2c; + /*font-weight: bold;*/ + color: #000000; float: left; } diff --git a/assets/lib/proekton-components/css/other.css b/assets/lib/proekton-components/css/other.css index 375262d..21206b3 100644 --- a/assets/lib/proekton-components/css/other.css +++ b/assets/lib/proekton-components/css/other.css @@ -10,8 +10,8 @@ label { } .selected-container .selected-element { - display: inline-block; - padding: 5px 25px 5px 10px; + /*display: inline-block;*/ + padding: 5px 35px 5px 10px; margin-top: 8px; min-height: 45px; background-color: #e3e3e3; @@ -21,35 +21,45 @@ label { -webkit-border-radius: 10px; /* Safari 4 */ border-radius: 10px; /* IE 9, Safari 5, Chrome */ } +.horizontal .selected-element{ + display: inline-block; +} -.selected-element .header{ - font-size: 9pt; - color: #979494; +.selected-element .header,.name{ white-space: nowrap; text-overflow: ellipsis; overflow: hidden; - word-wrap: break-word; + width: 100%; +} + +.selected-element .header{ + font-size: 7pt; + color: #676363; + /*white-space: nowrap;*/ + /*text-overflow: ellipsis;*/ + /*overflow: hidden;*/ + /*word-wrap: break-word;*/ + /*width: 100%;*/ } .selected-element .name { - font-size: 14pt; - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; - vertical-align: middle; - width: 100%; + font-size: 11pt; + /*white-space: nowrap;*/ + /*text-overflow: ellipsis;*/ + /*overflow: hidden;*/ + /*width: 100%;*/ } .selected-element .icon-remove{ background-image: url('../img/cross01.png'); - background-size: 24px 24px; + background-size: 20px 20px; /*display: inline-block;*/ position: absolute; right: 5px; top: 15px; - width: 16px; - height: 16px; + width: 20px; + height: 20px; cursor: pointer; margin-left: -20px; } @@ -66,7 +76,8 @@ label { } .separator { - margin: 20px 0; + margin-top: 35px; + margin-bottom: 5px; } .max-width { @@ -83,26 +94,26 @@ label { } .custom-check { background: url("../img/rect01.png") no-repeat center; - background-size: 200px 40px; - width: 200px; - height: 40px; + background-size: 210px 51px; + width: 210px; + height: 51px; cursor: pointer; } .custom-check.checked { background: url("../img/rect02.png") no-repeat center; - background-size: 200px 40px; - width: 200px; - height: 40px; + background-size: 210px 51px; + width: 210px; + height: 51px; } #page-preloader { - position: fixed; + position: absolute; left: 0; top: 0; right: 0; bottom: 0; - background: #000; + background: #090909; z-index: 100500; } diff --git a/assets/lib/proekton-components/css/select-box.css b/assets/lib/proekton-components/css/select-box.css index 15d067e..54eeb1a 100644 --- a/assets/lib/proekton-components/css/select-box.css +++ b/assets/lib/proekton-components/css/select-box.css @@ -1,10 +1,38 @@ +body { + font-size: 11pt; + font-family: Arial-MT-Regular, Arial, Sans-Serif; +} + +input[type="checkbox"] + span, input[type="checkbox"]:checked + span { + all: initial; + font-size: 9pt; + color: #494546; + cursor: pointer; +} + +.noselect { + -webkit-touch-callout: none; /* iOS Safari */ + -webkit-user-select: none; /* Chrome/Safari/Opera */ + -moz-user-select: none; /* Firefox */ + -ms-user-select: none; /* Internet Explorer/Edge */ + user-select: none; + /* Non-prefixed version, currently + not supported by any browser */ +} + +/*input[type="checkbox"]:checked + span {*/ +/*all: initial;*/ +/*font-size: 9pt;*/ +/*color: #494546;*/ +/*}*/ + .select-box-container { display: block; /*margin-top: 40px;*/ /*min-width: 200px;*/ } -.select-box-header{ +.select-box-header { font-size: 14pt; white-space: nowrap; word-wrap: break-word; @@ -12,7 +40,7 @@ /*top:10px;*/ } -.select-box-header .header{ +.select-box-header .header { display: inline-block; color: black; text-overflow: ellipsis; @@ -23,11 +51,15 @@ } /*.select-box-header i {*/ - /*position: relative;*/ - /*top: -5px;*/ +/*position: relative;*/ +/*top: -5px;*/ /*}*/ -.select-box-header .fa:hover{ +.select-box-header .fa { + color: #565656; +} + +.select-box-header .fa:hover { cursor: pointer; } @@ -70,17 +102,21 @@ padding: 2px 10px; border-bottom: 1px solid #afb2b6; list-style: none; + font-size: 9pt; + color: #494546; } .select-box-results label, .select-box-options label, .select-box-results li, .select-box-options li { cursor: pointer; + display: inline-block; width: 100%; } .select-box-results li:hover, .select-box-options li:hover { background-color: #dcdcdc; border-left: 2px solid red; + color: #0b0b0b; } .select-box-search { @@ -88,7 +124,7 @@ } input.select-box-search { - height: 40px; + height: 51px; width: 100%; border: 1px solid #cccccc; outline: none; @@ -157,15 +193,16 @@ input.select-box-search { .editable-container { display: block; float: left; - /*max-width: 400px;*/ background-color: #e5e5e5; - min-height: 40px; + color: #585858; + font-size: 9pt; padding: 5px 10px; - /*min-width: 40px;*/ + height: 51px; + margin-left: 8px; position: relative; left: -30px; } -.vertical-child{ +.vertical-child { margin-top: 30px; } \ No newline at end of file diff --git a/assets/lib/proekton-components/img/rect01.png b/assets/lib/proekton-components/img/rect01.png index 841209e9e760fdcc5ea2759997a9d51fd3da476c..aa314cee196eef72d3753a75a71ab7da44793a40 100644 GIT binary patch delta 2480 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 delta 2541 zcmV}G6TuXaZhyW>L_t(|obBCPY|~~N2k^gR=iD6JtcSFvR2)}W3u2lojlpg< zB$$vuOq&>51zd2$L~oeXiAiW0cZiF^)lMx8X>?p{Vh2qclePgGR1-|CG@wH2y0kQD zzYM2s66fH=-vw#6q;b+TNu4y$?<$R7J5M9$pV;r~*9-s|gntlHBpd*^TrSvbHnnRZ zgsdRb)6-~fZhjgv7K;T|t5xlq2q7y-JRS!CXjHC)5VFEi$Phw`ic`CQauJWmAqWBl zL4YWVh(scgWjbeGNf?HKR;z{4Xavvm;CUV_%c@;g$)k|TLY8H?-ENGHjUgJ1s$C9I znJ9{wnVG@l+g_Iykk}x_t3a{6T z*49?&^?J2SDoGSF3M5Iw(9jTq!JyiulnjPppw;QXv0O!bbH`#5Bq@eyG?KBM-|xrJ z&=9t6-3qN%yG+%U4+SShqVhl?lOh-l z(qR$+hkxT47>y>i%P2|J)ecluS<)^Ghr^henOWwFN*jet3hGG$^m;vPc3$l=O4>6u zHHwFiv=1etkVz2^ht)1Ybrdk!u`GuwOZw~mXdg;OA(Nug2i!3X1GBkG?J~+jmBRZ} z>HAPB3Yip@eyM;)!&bx?m_pF%bZMWj^nEB5?SD-q3CGdUsl}rAYH=uJNRkR23PXyB zLWU4hR1`9VkfNfHA%qkag$yC2s3>FzAw@-faDg($j+XaI`jE|3lWm&9E`A6JtH)dyN zvwyyp*=$B*Vgs~kYQ@hf zDcsZ3gX`C?XML^h+qdKV`SUn?_AG8B(tkG>{r&w|zkYqr>k(3lY^P4adg@ftbCEy( zfM?sbMXevWbP0&Zq3h^CWMBaPOP65#-~*tDqr6o=Txx1+$`}Hzt*ronEnBvvof-c2 z?b`^2LfEuv6YA>f7A&u-qU&(T3J{CszYSSN;NnF90DtZro*X-d=>7W${qz$IyMK1& zzkLO&hs=&0J8<&k$*k=TA3mJ+`MrDhVq#(f2M->^o;`aCTpb~$L5?Km8P4MtETLb1 zfiyA#ZrwWQUwjef&QAEcyW#KcEo#V6?-C(pKu$~_vEY164g$Ts0047mC%`Z;zx_7A zvJk)i8gZ|;Aa$lgAwx(RkQ1FAOMeZS`1CY_Uw!p&xBy@q8en+k708hY0$+Yvuv$}5 z$PiKnVpCH90F6U=e&I}l{r!-GK^R_s8C*-t{PX6{P5?lluP^T!mE?6!W@KapeHn@y z9UaZOjr;fSXWYilojVtFe-lzsBnk1v-80w>Lq;<3Cq84Q#IKk+rv3XNSbwdE+`Ws) z;2?Bcw&Yi98hM4x@bEB(hllejU~q5{gM)*L%WG3?Gz1NU0pbO^l0`1v)n-I!i5WnL?UoHomsa< z2w8qh3Yps4T7T5m)@E&IGMTVp!-llWoK9y!f}!O<*I^K{QZNPsG(4YmD$P_HyB!*v ztw>cZjp~O>gph?SCr-d};zZ8tHM-qJs3t#j6*eKHs3>FzAw@+YLkKA<3K>F3QBlZ{ zByyJf_7IXQ3K^0lp1A23$u1U?)GnbcP{@!Zk|fcunSVu+Bnp|uppZ$y6zHO`awW?$ zL@}s#8D$|52&8?!()XcM6f!BaTCLh8sBUI@TI~`_o-E7oE8NSS_Mv1HGAZ;q4&z>l z0s%ilAyMrzN}A6nK$4-De{Xdaf8fX zWWaG8HgDbxkH-U-%Y|r^dRxf9IF7@rRjc51I-$|f_q7rVnJgHFfz#m?Hy$CR zs3>FzAw|Uj!0hZSowy=|6x3|u0#XJ5O&&rBDVqNS-bD8|yX9&I00000NkvXXu0mjf DLqEoi diff --git a/assets/lib/proekton-components/js/SelectBox.js b/assets/lib/proekton-components/js/SelectBox.js index 59f6ece..5edb2a8 100644 --- a/assets/lib/proekton-components/js/SelectBox.js +++ b/assets/lib/proekton-components/js/SelectBox.js @@ -245,7 +245,8 @@ class SelectBox { } // FILL RESULTS - let result_template = (el, id) => `
    • `; + let result_template = (el, id) => + `
    • `; // MAIN PART let $container = this.$results_box.find('.main-part ul'); fillContainer($container, result_template, search_text, self.parent_id); diff --git a/assets/lib/proekton-components/js/SelectedContainer.js b/assets/lib/proekton-components/js/SelectedContainer.js index fccc924..43e0b30 100644 --- a/assets/lib/proekton-components/js/SelectedContainer.js +++ b/assets/lib/proekton-components/js/SelectedContainer.js @@ -22,9 +22,9 @@ class SelectedContainer { let htmlTemplate = `
    - +
    ${header} - +
    ${name}
    diff --git a/assets/lib/proekton-components/js/SimpleSelect.js b/assets/lib/proekton-components/js/SimpleSelect.js index a1ad262..7f3a48c 100644 --- a/assets/lib/proekton-components/js/SimpleSelect.js +++ b/assets/lib/proekton-components/js/SimpleSelect.js @@ -108,7 +108,8 @@ class SimpleSelect { } // FILL RESULTS - let result_template = (el, id) => `
    • `; + let result_template = (el, id) => + `
    • `; // MAIN PART let $container = this.$results_box.find('.main-part ul'); fillContainer($container, result_template, search_text, self.parent_id); diff --git a/assets/projects-filter.js b/assets/projects-filter.js new file mode 100644 index 0000000..294e7d7 --- /dev/null +++ b/assets/projects-filter.js @@ -0,0 +1,45 @@ +function getFormData($form, pageNum) { + var unindexed_array = $form.serializeArray(); + var indexed_array = {}; + + $.map(unindexed_array, function (n, i) { + indexed_array[n['name']] = n['value']; + }); + indexed_array["page"] = pageNum || ""; + return indexed_array; +} + +function modUrl($form, postfix) { + let curLoc = '?' + $form.serialize() + (postfix || ""); + try { + history.replaceState($form.serialize(), null, curLoc); + } catch (e) { + console.log("Error!"); + } +} + +function sendData(url, $form, pageNum) { + function updateResults(html) { + $container.html(html); + } + + const $container = $('#projectsBlock'); + $.ajax({ + url: url, + type: "POST", + dataType: 'html', + data: getFormData($form, pageNum), + beforeSend: function (xhr) { + xhr.setRequestHeader("X-CSRFToken", $.cookie('csrftoken')); + }, + success: updateResults, + error: (data) => console.log("Error", data) + }); +} + +function sendFilterData(url) { + const $form = $('#filter-form'); + sendData('/projects/', $form); + modUrl($form); + return false; +} \ No newline at end of file diff --git a/projects/templates/partials/inc-projects-filter.html b/projects/templates/partials/inc-projects-filter.html new file mode 100644 index 0000000..11a9035 --- /dev/null +++ b/projects/templates/partials/inc-projects-filter.html @@ -0,0 +1,119 @@ +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    + +
    +
    +

    Поиск по ключевым словам и фразам

    +
    +
    +
    +
    +
    + +
    +
    + +
    +
    +{# $(this).closest('form').submit(); return false#} + + найти проект + +
    +
    + + {# TODO: Сделать очистку, без перезагрузки#} + Очистить фильтр + +
    +
    + + +
    +
    +

    Расширенные поля

    + +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    + Требуется допуск (СРО) + +
    +
    + +
    +
    +
    +
    +
    +
    \ No newline at end of file diff --git a/projects/templates/partials/inc-projects-results.html b/projects/templates/partials/inc-projects-results.html new file mode 100644 index 0000000..d262f8d --- /dev/null +++ b/projects/templates/partials/inc-projects-results.html @@ -0,0 +1,72 @@ +

    + {% if num_results > 0 %} + Найдено {{ num_results }} проектов + {% else %} + Ничего не найдено + {% endif %} +

    +{# SORT_BY #} +{% include 'partials/inc-projects-sort_by.html' %} +
    + {% for project in projects %} +
    +
    +

    + {{ project.name }} +

    + + {% if project.realty and project.realty.name %} +
      + + {% endif %} + +

      {{ project.text|linebreaksbr|truncatechars:300 }}

      + + {% if TEMPLATE_DEBUG %} + 
      Specialization: {{ project.specialization }}

      Realty location: {{ project.realty.location }}

      Constr. type: {{ project.realty.construction_type }}

      Build. classif.: {{ project.realty.building_classification }}
      + {% endif %} + +
        +
      • {{ project.created }}
        • +
      • {{ project.hit_count.hits }}
        • +
      • {{ project.answers.count }}
        • + + {% if request.user.is_authenticated %} +
      • {{ project.customer.username }}
        • + {% endif %} +
      +
    +
    +

    + {{ project.budget }} +

    + +
      + {% if project.secure_deal %} +
    • Безопасная сделка
      • + {% endif %} + +
    • + {{ project.specialization.name }} +
      • +
    +
    +
    + {% endfor %} +
    +
    + {% include 'partials/ajax_pagination.html' %} +
    \ No newline at end of file diff --git a/projects/templates/partials/inc-projects-sort_by.html b/projects/templates/partials/inc-projects-sort_by.html new file mode 100644 index 0000000..2084d3d --- /dev/null +++ b/projects/templates/partials/inc-projects-sort_by.html @@ -0,0 +1,13 @@ +
    +

    Сортировать по:

    + + {% for val, text in choices %} + + {% endfor %} + +{# #} +{# #} +
    \ No newline at end of file diff --git a/projects/templates/project_filter.html b/projects/templates/project_filter.html index ca7b083..f81d7a9 100644 --- a/projects/templates/project_filter.html +++ b/projects/templates/project_filter.html @@ -7,216 +7,22 @@ {% endblock %} {% block content %} {% include 'partials/header.html' %} -
    -
    -
    -
    + +
    +
    +

    Поиск заказов

    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    - -
    -
    -

    Поиск по ключевым словам и фразам

    -
    -
    -
    -
    -
    - -
    -
    - -
    -
    - - найти проект - -
    -
    - - {# TODO: Сделать очистку, без перезагрузки#} - Очистить фильтр - -
    -
    - - -
    -
    -

    Расширенные поля

    - -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    - Требуется допуск (СРО) - -
    -
    - -
    -
    -
    -
    - - -
    - {# FILTERS #} -
    -

    {{ display_msg }}

    -
    -

    Сортировать по:

    - - {% for val, text in form.order_by.field.choices %} - - {% endfor %} - - - -
    -
    - {# PROJECTS LIST #} -
    - {% for project in projects %} -
    -
    -

    - {{ project.name }} -

    - - {% if project.realty and project.realty.name %} - - {% endif %} + {# FILTER#} + {% include 'partials/inc-projects-filter.html' %} -

    {{ project.text|linebreaksbr|truncatechars:300 }}

    - - {% if TEMPLATE_DEBUG %} - 
    Specialization: {{ project.specialization }}

    Realty location: {{ project.realty.location }}

    Constr. type: {{ project.realty.construction_type }}

    Build. classif.: {{ project.realty.building_classification }}
    - {% endif %} - -
      -
    • {{ project.created }}
      • -
    • {{ project.hit_count.hits }}
      • -
    • {{ project.answers.count }}
      • - - {% if request.user.is_authenticated %} -
    • {{ project.customer.username }}
      • - {% endif %} -
    -
    -
    -

    - {{ project.budget }} -

    - -
      - {% if project.secure_deal %} -
    • Безопасная сделка
      • - {% endif %} - -
    • - {{ project.specialization.name }} -
      • -
    -
    -
    - {% endfor %} -
    - - -
    - {% include 'partials/pagination.html' %} -
    - - - {% include 'partials/footer.html' %} +
    +
    + {% include 'partials/inc-projects-results.html' %}
    - + {% include 'partials/footer.html' %} +
    {% endblock %} @@ -229,6 +35,7 @@ + diff --git a/projects/views.py b/projects/views.py index 9f7d88e..4ab7b5c 100644 --- a/projects/views.py +++ b/projects/views.py @@ -286,26 +286,26 @@ def build_query(id_str, _class, *args): class ProjectFilterView(BaseMixin, View): template_name = 'project_filter.html' - form_class = ProjectFilterForm - - def get(self, request, *args, **kwargs): - context = self.get_context_data(**_.merge({}, request.GET, kwargs)) - form = self.form_class(request.GET, request=request) + # form_class = ProjectFilterForm + # renderer_classes = (TemplateHTMLRenderer,) + PROJECT_ORDER_CHOICES = ( # "Упорядочить по"... + ('name', 'названию'), + ('budget', 'цене'), + ('created', 'дате размещения'), + ('views', 'просмотрам'), + ) - projects = Project.objects.filter(state='active') - specialization = request.GET.get('specialization') - keywords = request.GET.get('keywords') - building_classification = request.GET.get('building_classification') - construction_type = request.GET.get('construction_type') - location = request.GET.get('location') - cro = request.GET.get('cro') - order_by = request.GET.get('order_by') - last_order_by = request.GET.get('last_order_by') - reverse_order = request.GET.get('reverse_order') - ord = None - manual_sort = None + def filter(self, projects, data): + # print("filter data = ", data) + specialization = data.get('specialization') + keywords = data.get('keywords') + building_classification = data.get('building_classification') + construction_type = data.get('construction_type') + location = data.get('location') + cro = data.get('cro') if keywords: + # print("keywords = ", keywords) keywords = tuple(filter(None, re.split(r'\s|,|;', keywords))) for k in keywords: @@ -334,31 +334,33 @@ class ProjectFilterView(BaseMixin, View): if cro: projects = projects.filter(cro=True) - # ORDERS - if order_by: - reverse_order = not reverse_order if order_by == last_order_by else False - ord = order_by - last_order_by = ord - elif last_order_by: - ord = last_order_by - - if ord and ord == 'views': - projects = natsort.natsorted(projects.all(), key=lambda p: p.hit_count.hits, reverse=reverse_order) - manual_sort = True - elif ord: - projects = projects.order_by('-%s' % ord if reverse_order else ord) - - context.update({ - 'last_order_by': last_order_by, - 'reverse_order': reverse_order, - }) - - project_count = len(projects) - display_msg = 'Найдено %s проектов' % project_count if project_count > 0 else 'Ничего не найдено' - - paginator = Paginator(projects if manual_sort else projects.all(), settings.PAGE_SIZE) - page = request.GET.get('page') - + return projects + + def sort_by(self, projects): + # order_by = request.GET.get('order_by') + # last_order_by = request.GET.get('last_order_by') + # reverse_order = request.GET.get('reverse_order') + # ord = None + # manual_sort = None + # + # # ORDERS + # if order_by: + # reverse_order = not reverse_order if order_by == last_order_by else False + # ord = order_by + # last_order_by = ord + # elif last_order_by: + # ord = last_order_by + # + # if ord and ord == 'views': + # projects = natsort.natsorted(projects.all(), key=lambda p: p.hit_count.hits, reverse=reverse_order) + # manual_sort = True + # elif ord: + # projects = projects.order_by('-%s' % ord if reverse_order else ord) + return projects + + def pagination(self, projects, page): + paginator = Paginator(projects, settings.PAGE_SIZE) + # print("pag page = ", page) try: projects = paginator.page(page) except PageNotAnInteger: @@ -366,16 +368,31 @@ class ProjectFilterView(BaseMixin, View): except EmptyPage: projects = paginator.page(paginator.num_pages) + return projects + + def get_context(self, request): + context = request.dict() + + projects = Project.objects.filter(state='active') + projects = self.filter(projects, request) + num_results = projects.count() + projects = self.sort_by(projects) + projects = self.pagination(projects, request.get("page")) + context.update({ - 'form': form, - # 'realty_form': realty_form, + 'choices': self.PROJECT_ORDER_CHOICES, 'projects': projects, 'is_paginated': True, - # 'page_obj': projects, - 'display_msg': display_msg, + 'page_obj': projects, + 'num_results': num_results, }) + return context - return render(request, self.template_name, context) + def get(self, request): + return render(request, self.template_name, self.get_context(request.GET)) + + def post(self, request): + return render(request, 'partials/inc-projects-results.html', self.get_context(request.POST)) class CustomerProjectCreateView(BaseMixin, View): diff --git a/templates/partials/ajax_pagination.html b/templates/partials/ajax_pagination.html new file mode 100644 index 0000000..67b2b34 --- /dev/null +++ b/templates/partials/ajax_pagination.html @@ -0,0 +1,65 @@ +{% if is_paginated %} + + + +{% endif %} \ No newline at end of file From 605a8e0ad223d1554952d42d008e947f83d884bc Mon Sep 17 00:00:00 2001 From: booblegum Date: Fri, 11 Nov 2016 10:45:58 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D0=9A=D0=BE=D1=81=D1=82=D1=8B=D0=BB=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Увеличено максимальное кол-во объектов получаемых единовременно по api --- archilance/settings/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/archilance/settings/base.py b/archilance/settings/base.py index 2a0274e..4b7de8e 100644 --- a/archilance/settings/base.py +++ b/archilance/settings/base.py @@ -271,7 +271,7 @@ LOGIN_REDIRECT_URL = '/projects/' LOGIN_URL = '/users/login/' PAGE_SIZE = 10 # Non-api page size (regular views) -API_PAGE_SIZE = 100 # Django REST framework +API_PAGE_SIZE = 2000 # Django REST framework REST_FRAMEWORK = { 'DEFAULT_AUTHENTICATION_CLASSES': [