mitri4
/
proekton.com
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Specialization select dynamic labels

Browse Source
remotes/origin/PR-39
ArturBaybulatov 9 years ago
parent c3fc87c327
commit a88f3d8c8b
14 changed files with 83 additions and 60 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      assets/css/extra.css
  2. 9
      assets/index.js
  3. 2
      assets/js/chat.js
  4. 2
      projects/admin.py
  5. 13
      projects/templates/contractor_portfolio_edit.html
  6. 18
      projects/templates/customer_project_create.html
  7. 18
      projects/templates/customer_project_edit.html
  8. 14
      projects/templates/project_filter.html
  9. 6
      specializations/admin.py
  10. 2
      templates/partials/base.html
  11. 16
      users/templates/contractor_filter.html
  12. 13
      users/templates/portfolio_create_form.html
  13. 13
      users/templates/worksell_create_form.html
  14. 13
      work_sell/templates/worksell_edit.html

4
assets/css/extra.css
Unescape View File

@ -243,3 +243,7 @@ li a:active .count-tab, li a:hover .count-tab{
.select2-drop {
width: 400px !important;
}
.-bold {
font-weight: bold;
}

9
assets/index.js
Unescape View File

@ -163,7 +163,8 @@ $('[data-tooltip]').tooltip({
// TODO: Hardcoded:
specSelects[0].select2('container').closest('.col-lg-3').css('display', workTypeId === 2 ? 'none' : 'block')
specSelects[0].select2('container').closest('.-single-spec-select').css('display', workTypeId === 2 ? 'none' : 'block')
specSelects[1].select2('container').closest('.-single-spec-select').find('.-dynamic-label').first().text(workTypeId === 2 ? 'Перечень услуг' : 'Стадия проекта')
return rootSpec
@ -196,9 +197,9 @@ $('[data-tooltip]').tooltip({
specSelects[3].select2('enable', Boolean(specLevel3 && !_.isEmpty(specLevel3.children)))
specializationTreeHasLevels(specId).then(function(haveLevels) {
specSelects[1].select2('container').css('display', haveLevels.level2 ? 'block' : 'none')
specSelects[2].select2('container').css('display', haveLevels.level3 ? 'block' : 'none')
specSelects[3].select2('container').css('display', haveLevels.level4 ? 'block' : 'none')
specSelects[1].select2('container').closest('.-single-spec-select').css('display', haveLevels.level2 ? 'block' : 'none')
specSelects[2].select2('container').closest('.-single-spec-select').css('display', haveLevels.level3 ? 'block' : 'none')
specSelects[3].select2('container').closest('.-single-spec-select').css('display', haveLevels.level4 ? 'block' : 'none')
})
})
}

2
assets/js/chat.js
Unescape View File

@ -29,7 +29,7 @@ window.confirm = function (message, callback, caption) {
var SocketHandler = function () {
domain = domain.replace(':' + port, '');
var url = 'ws://' + domain + '/chat/' + userId + '/';
var url = 'ws://' + domain + ':8888/chat/' + userId + '/';
var sock = new WebSocket(url);
var intervalId;
sock.onopen = function () {

2
projects/admin.py
Unescape View File

@ -49,7 +49,7 @@ class StageAdmin(admin.ModelAdmin):
admin.site.register(Answer)
admin.site.register(Arbitration)
admin.site.register(BuildingClassfication,BuildingClassficationAdmin)
admin.site.register(BuildingClassfication, BuildingClassficationAdmin)
admin.site.register(Candidate)
admin.site.register(ConstructionType)
admin.site.register(Order, OrderAdmin)

13
projects/templates/contractor_portfolio_edit.html
Unescape View File

@ -53,22 +53,25 @@
</div>
<div class="textAreaBlock2 text-nn box-sizing disTab">
<p>Специализации</p>
</div>
<div class="col-lg-3">
<div class="col-lg-3 -single-spec-select">
<div class="-bold">Стадия проекта <span style="color: red">{{ form.specialization.errors.as_text }}</span></div>
<input type='hidden' class="-spec-select -spec-select-level-1" style="width: 100%">
</div>
<div class="col-lg-3">
<div class="col-lg-3 -single-spec-select">
<div class="-bold"><span class="-dynamic-label">Стадия проекта</span></div>
<input type='hidden' class="-spec-select -spec-select-level-2" style="width: 100%">
</div>
<div class="col-lg-3">
<div class="col-lg-3 -single-spec-select">
<div class="-bold">Раздел</div>
<input type='hidden' class="-spec-select -spec-select-level-3" style="width: 100%">
</div>
<div class="col-lg-3">
<div class="col-lg-3 -single-spec-select">
<div class="-bold">Подраздел</div>
<input type='hidden' class="-spec-select -spec-select-level-4" style="width: 100%">
</div>

18
projects/templates/customer_project_create.html
Unescape View File

@ -83,26 +83,24 @@
</div>
<div class="col-lg-12 new-filter">
<div class="filter clearfix">
<div class="titleF1 disTab">
<div class="col-lg-12">Специализация проекта <span data-tooltip data-placement="{% tooltip_placement pk=7 %}" title="{% tooltip pk=7 %}" class="-green-glyphicon glyphicon glyphicon-question-sign"></span> <span id="{% random_ident %}" class="-validation-error" style="color: red">{{ form.specialization.errors.as_text }}</span></div>
<!--<div class="col-lg-3"></div>
<div class="col-lg-3"></div>
<div class="col-lg-3"></div>-->
</div>
<div class="polsF1 disTab">
<div class="col-lg-3">
<div class="col-lg-3 -single-spec-select">
<div class="-bold">Стадия проекта <span data-tooltip data-placement="{% tooltip_placement pk=7 %}" title="{% tooltip pk=7 %}" class="-green-glyphicon glyphicon glyphicon-question-sign"></span> <span id="{% random_ident %}" class="-validation-error" style="color: red">{{ form.specialization.errors.as_text }}</span></div>
<input type="hidden" class="-spec-select -spec-select-level-1" style="width: 100%">
</div>
<div class="col-lg-3">
<div class="col-lg-3 -single-spec-select">
<div class="-bold"><span class="-dynamic-label">Стадия проекта</span></div>
<input type="hidden" class="-spec-select -spec-select-level-2" style="width: 100%">
</div>
<div class="col-lg-3">
<div class="col-lg-3 -single-spec-select">
<div class="-bold">Раздел</div>
<input type="hidden" class="-spec-select -spec-select-level-3" style="width: 100%">
</div>
<div class="col-lg-3">
<div class="col-lg-3 -single-spec-select">
<div class="-bold">Подраздел</div>
<input type="hidden" class="-spec-select -spec-select-level-4" style="width: 100%">
</div>

18
projects/templates/customer_project_edit.html
Unescape View File

@ -93,26 +93,24 @@
</div>
<div class="col-lg-12 new-filter">
<div class="filter clearfix">
<div class="titleF1 disTab">
<div class="col-lg-12">Специализация проекта <span id="{% random_ident %}" class="-validation-error" style="color: red">{{ form.specialization.errors.as_text }}</span></div>
<!--<div class="col-lg-3"></div>
<div class="col-lg-3"></div>
<div class="col-lg-3"></div>-->
</div>
<div class="polsF1 disTab">
<div class="col-lg-3">
<div class="col-lg-3 -single-spec-select">
<div class="-bold">Стадия проекта <span data-tooltip data-placement="{% tooltip_placement pk=7 %}" title="{% tooltip pk=7 %}" class="-green-glyphicon glyphicon glyphicon-question-sign"></span> <span id="{% random_ident %}" class="-validation-error" style="color: red">{{ form.specialization.errors.as_text }}</span></div>
<input type="hidden" class="-spec-select -spec-select-level-1" style="width: 100%">
</div>
<div class="col-lg-3">
<div class="col-lg-3 -single-spec-select">
<div class="-bold"><span class="-dynamic-label">Стадия проекта</span></div>
<input type="hidden" class="-spec-select -spec-select-level-2" style="width: 100%">
</div>
<div class="col-lg-3">
<div class="col-lg-3 -single-spec-select">
<div class="-bold">Раздел</div>
<input type="hidden" class="-spec-select -spec-select-level-3" style="width: 100%">
</div>
<div class="col-lg-3">
<div class="col-lg-3 -single-spec-select">
<div class="-bold">Подраздел</div>
<input type="hidden" class="-spec-select -spec-select-level-4" style="width: 100%">
</div>

14
projects/templates/project_filter.html
Unescape View File

@ -28,21 +28,23 @@
<div class="titleF1 disTab">
<div class="col-lg-3">Специализации</div>
<div class="col-lg-9"></div>
</div>
<div class="polsF1 disTab">
<div class="col-lg-3">
<div class="col-lg-3 -single-spec-select">
<div class="-bold">Стадия проекта <span style="color: red">{{ form.specialization.errors.as_text }}</span></div>
<input type="hidden" class="-spec-select -spec-select-level-1" style="width: 100%">
</div>
<div class="col-lg-3">
<div class="col-lg-3 -single-spec-select">
<div class="-bold"><span class="-dynamic-label">Стадия проекта</span></div>
<input type="hidden" class="-spec-select -spec-select-level-2" style="width: 100%">
</div>
<div class="col-lg-3">
<div class="col-lg-3 -single-spec-select">
<div class="-bold">Раздел</div>
<input type="hidden" class="-spec-select -spec-select-level-3" style="width: 100%">
</div>
<div class="col-lg-3">
<div class="col-lg-3 -single-spec-select">
<div class="-bold">Подраздел</div>
<input type="hidden" class="-spec-select -spec-select-level-4" style="width: 100%">
</div>

6
specializations/admin.py
Unescape View File

@ -3,4 +3,8 @@ from mptt.admin import MPTTModelAdmin
from .models import Specialization
admin.site.register(Specialization, MPTTModelAdmin)
class SpecializationAdmin(MPTTModelAdmin):
readonly_fields = ('pk', 'lft', 'rght', 'tree_id', 'level')
admin.site.register(Specialization, SpecializationAdmin)

2
templates/partials/base.html
Unescape View File

@ -86,7 +86,7 @@
if ((queryString.indexOf('/chat') != 0) && (queryString.indexOf('/users/contractor-office/510/work-projects') != 0)) {
domain = domain.replace(':' + port, '');
var url = 'ws://' + domain + '/chat/' + userId + '/';
var url = 'ws://' + domain + ':8888/chat/' + userId + '/';
var sock = new WebSocket(url);
var intervalId;
sock.onopen = function () {

16
users/templates/contractor_filter.html
Unescape View File

@ -38,20 +38,24 @@
<div class="titleF1 disTab">
<div class="col-lg-3">Специализации</div>
</div>
<div class="polsF1 disTab">
<div class="col-lg-3">
<div class="col-lg-3 -single-spec-select">
<div class="-bold">Стадия проекта <span style="color: red">{{ form.specialization.errors.as_text }}</span></div>
<input type="hidden" class="-spec-select -spec-select-level-1" style="width: 100%">
</div>
<div class="col-lg-3">
<div class="col-lg-3 -single-spec-select">
<div class="-bold"><span class="-dynamic-label">Стадия проекта</span></div>
<input type="hidden" class="-spec-select -spec-select-level-2" style="width: 100%">
</div>
<div class="col-lg-3">
<div class="col-lg-3 -single-spec-select">
<div class="-bold">Раздел</div>
<input type="hidden" class="-spec-select -spec-select-level-3" style="width: 100%">
</div>
<div class="col-lg-3">
<input type="hidden" class="-spec-select -spec-select-level-4" style="width: 100%">
<div class="col-lg-3 -single-spec-select">
<div class="-bold">Подраздел</div>
<input type="hidden" class="-spec-select -spec-select-level-4" style="width: 100%">
</div>
<input type="hidden" name="{{ form.specialization.html_name }}" value="{{ form.specialization.value }}" class="-chosen-spec-id">

13
users/templates/portfolio_create_form.html
Unescape View File

@ -31,22 +31,25 @@
</div>
<div class="textAreaBlock2 text-nn box-sizing disTab">
<p>Специализации</p>
</div>
<div class="col-lg-3">
<div class="col-lg-3 -single-spec-select">
<div class="-bold">Стадия проекта <span style="color: red">{{ portfolio_form.specialization.errors.as_text }}</span></div>
<input type='hidden' class="-spec-select -spec-select-level-1" style="width: 100%">
</div>
<div class="col-lg-3">
<div class="col-lg-3 -single-spec-select">
<div class="-bold"><span class="-dynamic-label">Стадия проекта</span></div>
<input type='hidden' class="-spec-select -spec-select-level-2" style="width: 100%">
</div>
<div class="col-lg-3">
<div class="col-lg-3 -single-spec-select">
<div class="-bold">Раздел</div>
<input type='hidden' class="-spec-select -spec-select-level-3" style="width: 100%">
</div>
<div class="col-lg-3">
<div class="col-lg-3 -single-spec-select">
<div class="-bold">Подраздел</div>
<input type='hidden' class="-spec-select -spec-select-level-4" style="width: 100%">
</div>

13
users/templates/worksell_create_form.html
Unescape View File

@ -26,22 +26,25 @@
</div>
<div class="textAreaBlock2 text-nn box-sizing disTab">
<p>Специализации</p>
</div>
<div class="col-lg-3">
<div class="col-lg-3 -single-spec-select">
<div class="-bold">Стадия проекта <span style="color: red">{{ worksell_form.specialization.errors.as_text }}</span></div>
<input type='hidden' class="-spec-select -spec-select-level-1" style="width: 100%">
</div>
<div class="col-lg-3">
<div class="col-lg-3 -single-spec-select">
<div class="-bold"><span class="-dynamic-label">Стадия проекта</span></div>
<input type='hidden' class="-spec-select -spec-select-level-2" style="width: 100%">
</div>
<div class="col-lg-3">
<div class="col-lg-3 -single-spec-select">
<div class="-bold">Раздел</div>
<input type='hidden' class="-spec-select -spec-select-level-3" style="width: 100%">
</div>
<div class="col-lg-3">
<div class="col-lg-3 -single-spec-select">
<div class="-bold">Подраздел</div>
<input type='hidden' class="-spec-select -spec-select-level-4" style="width: 100%">
</div>

13
work_sell/templates/worksell_edit.html
Unescape View File

@ -51,23 +51,26 @@
</div>
<div class="textAreaBlock2 text-nn box-sizing disTab">
<p>Специализации <span style="color: red">{{ form.specialization.errors.as_text }}</span></p>
</div>
<div class="col-lg-3">
<div class="col-lg-3 -single-spec-select">
<div class="-bold">Стадия проекта <span style="color: red">{{ form.specialization.errors.as_text }}</span></div>
<input type='hidden' class="-spec-select -spec-select-level-1" style="width: 100%">
</div>
<div class="col-lg-3">
<div class="col-lg-3 -single-spec-select">
<div class="-bold"><span class="-dynamic-label">Стадия проекта</span></div>
<input type='hidden' class="-spec-select -spec-select-level-2" style="width: 100%">
</div>
<div class="col-lg-3">
<div class="col-lg-3 -single-spec-select">
<div class="-bold">Раздел</div>
<input type='hidden' class="-spec-select -spec-select-level-3" style="width: 100%">
</div>
<div class="col-lg-3">
<div class="col-lg-3 -single-spec-select">
<div class="-bold">Подраздел</div>
<input type='hidden' class="-spec-select -spec-select-level-4" style="width: 100%">
</div>

Write Preview
Loading…
Cancel
Save