mitri4
/
dokumentor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

changed popup docs menu

Browse Source
remotes/origin/mitri4
apache 9 years ago
parent dff68b187b
commit 4108ce58cb
8 changed files with 72 additions and 67 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. 9
      project/docs/views/base_views.py
  2. 1
      project/docs/views/invoice.py
  3. 32
      project/templates/docs/_base/base_list.html
  4. 16
      project/templates/docs/_base/preview.html
  5. 32
      project/templates/docs/parts/doc_actions.html
  6. 18
      project/templates/docs/parts/doc_actions2nd.html
  7. 18
      project/templates/docs/parts/invoice_create_docs.html
  8. 13
      project/templates/docs/parts/invoice_docs_list.html

9
project/docs/views/base_views.py
Unescape View File

@ -87,6 +87,7 @@ class BaseViews(object):
TEMPLATE_IMG = 'docs/_base/preview.html'
TEMPLATE_FORM_JS = 'docs/stub_js.html'
TEMPLATE_CREATE_DOCS = ''
TEMPLATE_DOCS_LIST = ''
TEMPLATE_EMAIL = 'docs/email/base_email.html'
TEMPLATE_EMAIL_FORM = 'docs/email/base_email_form.html'
@ -231,6 +232,7 @@ class BaseViews(object):
'obj_list_count_before_filtering': obj_list_count_before_filtering,
'email_form': email_form,
'template_create_docs': self.TEMPLATE_CREATE_DOCS,
'template_docs_list': self.TEMPLATE_DOCS_LIST,
'maybe_sign': self.MAYBE_SIGNED,
}
self.update_list_dict(dictionary)
@ -339,7 +341,7 @@ class BaseViews(object):
if self.request.method == 'POST':
obj.delete()
success = True
result = {'title': u'Удаление документа',
result = {'title': u'Удаление документа',
'msg': u'Удалён документ:<br /> %s №%d от %s' % (self.PADEJI['imenit'], del_num, del_date),
'success': success,
'del_id': del_id,
@ -434,9 +436,10 @@ class BaseViews(object):
'padeji_mnoj': self.PADEJI_MNOJ,
'url_prefix': self.URL_PREFIX,
'template_create_docs': self.TEMPLATE_CREATE_DOCS,
'template_docs_list': self.TEMPLATE_DOCS_LIST,
'email_form': email_form,
'maybe_sign': self.MAYBE_SIGNED,
}
}
return render(self.request, self.TEMPLATE_IMG, dictionary)
except:
raise
@ -717,7 +720,7 @@ class BaseItemsViews(BaseViews):
d.pop('created_at', None)
d.pop('updated_at', None)
kwargs['initial_items'].append(d)
self.set_item_formset_class(extra_count=len(kwargs['initial_items']))
return self.add(self.request, *args, **kwargs)

1
project/docs/views/invoice.py
Unescape View File

@ -40,6 +40,7 @@ class InvoiceViews(BaseItemsViews):
TEMPLATE_LIST = 'docs/invoice/list.html'
TEMPLATE_FORM = 'docs/invoice/form.html'
TEMPLATE_CREATE_DOCS = 'docs/parts/invoice_create_docs.html'
TEMPLATE_DOCS_LIST = 'docs/parts/invoice_docs_list.html'
# для генерации pdf/xls
PDF_TEMPLATE = 'docs/invoice/as_pdf.html'

32
project/templates/docs/_base/base_list.html
Unescape View File

@ -46,17 +46,7 @@
<tbody>
{% for obj in page.object_list %}
{% url url_prefix|add:'edit' id=obj.pk as url_edit %}
{% url url_prefix|add:'copy' id=obj.pk as url_copy %}
{% url url_prefix|add:'delete' id=obj.pk as url_delete %}
{% url url_prefix|add:'email' id=obj.pk as url_email %}
{% url url_prefix|add:'img' id=obj.pk as url_img %}
{% url url_prefix|add:'pdf' id=obj.pk as url_pdf %}
{% url url_prefix|add:'xls' id=obj.pk as url_xls %}
{% url 'docs_aktrabot_add_by_invoice' invoice_id=obj.pk as url_aktrabot_by_invoice %}
{% url 'docs_nakladn_add_by_invoice' invoice_id=obj.pk as url_nakladn_by_invoice %}
{% url 'docs_faktura_add_by_invoice' invoice_id=obj.pk as url_faktura_by_invoice %}
<tr id="doc_row_{{ obj.pk }}" class="doc-row {% cycle 'even' 'odd' %}" data-id="{{ obj.pk }}">
{% block table_obj_cells %}
@ -88,19 +78,29 @@
<div class="list-col2">
{% for obj in page.object_list %}
{% url 'docs_aktrabot_add_by_invoice' invoice_id=obj.pk as url_aktrabot_by_invoice %}
{% url 'docs_nakladn_add_by_invoice' invoice_id=obj.pk as url_nakladn_by_invoice %}
{% url 'docs_faktura_add_by_invoice' invoice_id=obj.pk as url_faktura_by_invoice %}
<div id="doc_panel_{{ obj.pk }}" class="doc-panel hidden" style="" data-docname='{{ padeji.imenit }} №{{ obj.docnum }} от {{ obj.doc_date }}'>
{% include "docs/parts/doc_actions.html" %}
{% include "docs/parts/doc_actions.html" %}
{% if template_docs_list %}
{% include template_docs_list %}
{% endif %}
{% url url_prefix|add:'copy' id=obj.pk as url_copy %}
<div class="doc-panel-header">Создать</div>
<a class="doc copy-link" href="{{ url_copy }}" title="Копию {{ padeji.rodit }}">Копию {{ padeji.rodit }}</a>
{% block panel_copy %}
{% if template_create_docs%}
{% if template_create_docs %}
{% include template_create_docs %}
{% endif %}
{% endblock %}
{% include "docs/parts/doc_actions2nd.html" %}
{% include "docs/parts/doc_actions2nd.html" %}
</div>
{% endfor %}
<div class="filters">
<div class="filters-header">
<span>Фильтр списка</span>

16
project/templates/docs/_base/preview.html
Unescape View File

@ -22,13 +22,25 @@
</div>
<div class="preview-col2">
<div id="doc_panel_{{ obj.pk }}" class="doc-panel" style="" data-redirect='{{ url_list }}' data-docname='{{ padeji.imenit }} №{{ obj.doc_num }} от {{ obj.doc_date }}'>
{% include "docs/parts/doc_actions.html" %}
{% include "docs/parts/doc_actions.html" %}
{% if template_docs_list %}
{% include template_docs_list %}
{% endif %}
{% url url_prefix|add:'copy' id=obj.pk as url_copy %}
<div class="doc-panel-header">Создать</div>
<a class="doc copy-link" href="{{ url_copy }}" title="Копию {{ padeji.rodit }}">Копию {{ padeji.rodit }}</a>
{% block panel_copy %}
{% if template_create_docs %}
{% include template_create_docs %}
{% endif %}
{% endblock %}
{% include "docs/parts/doc_actions2nd.html" %}
{% include "docs/parts/doc_actions2nd.html" %}
</div>
</div>
<div class="clear"></div>

32
project/templates/docs/parts/doc_actions.html
Unescape View File

@ -1,27 +1,17 @@
{% url url_prefix|add:'img' id=obj.pk as url_img %}
{% url url_prefix|add:'pdf' id=obj.pk as url_pdf %}
{% url url_prefix|add:'xls' id=obj.pk as url_xls %}
{% url url_prefix|add:'copy' id=obj.pk as url_copy %}
{% url url_prefix|add:'img' id=obj.pk as url_img %}
{% url url_prefix|add:'pdf' id=obj.pk as url_pdf %}
{% url url_prefix|add:'xls' id=obj.pk as url_xls %}
<div class="doc-panel-header">Скачать документ</div>
{% url 'docs_aktrabot_add_by_invoice' invoice_id=obj.pk as url_aktrabot_by_invoice %}
{% url 'docs_nakladn_add_by_invoice' invoice_id=obj.pk as url_nakladn_by_invoice %}
{% url 'docs_faktura_add_by_invoice' invoice_id=obj.pk as url_faktura_by_invoice %}
{% if not images %}
<a class="doc look-link" href="{{ url_img }}">Предпросмотр {{ padeji.rodit }}</a>
{% endif %}
<div class="doc-panel-header">Скачать документ</div>
<div class="clear"></div>
{% if not images %}
<a class="doc look-link" href="{{ url_img }}">
Предпросмотр {{ padeji.rodit }}</a>
{% endif %}
<div class="clear"></div>
<a class="doc pdf-link left" href="{{ url_pdf }}">
Документ в PDF</a>
<a class="doc excel-link left" href="{{ url_xls }}">
Документ в Excel</a>
<div class="clear"></div>
<a class="doc pdf-link left" href="{{ url_pdf }}">Документ в PDF</a>
<div class="doc-panel-header">Создать</div>
<a class="doc copy-link" href="{{ url_copy }}" title="Копию {{ padeji.rodit }}">Копию {{ padeji.rodit }}</a>
<a class="doc excel-link left" href="{{ url_xls }}"> Документ в Excel</a>
<div class="clear"></div>

18
project/templates/docs/parts/doc_actions2nd.html
Unescape View File

@ -1,15 +1,13 @@
{% url url_prefix|add:'edit' id=obj.pk as url_edit %}
{% url url_prefix|add:'delete' id=obj.pk as url_delete %}
{% url url_prefix|add:'email' id=obj.pk as url_email %}
{% url url_prefix|add:'edit' id=obj.pk as url_edit %}
{% url url_prefix|add:'delete' id=obj.pk as url_delete %}
{% url url_prefix|add:'email' id=obj.pk as url_email %}
<div class="doc-panel-header">Действия с документом</div>
<a class="doc email-link" href="{{ url_email }}">
Отправить по e-mail</a>
<a class="doc email-link" href="{{ url_email }}">Отправить по e-mail</a>
<a class="doc edit-link" href="{{ url_edit }}">
Редактировать документ</a>
<a class="doc edit-link" href="{{ url_edit }}">Редактировать документ</a>
<a class="doc delete-link" href="{{ url_delete }}">
Удалить документ</a>
<a class="doc delete-link" href="{{ url_delete }}">Удалить документ</a>
<div class="clear"></div>
<div class="clear"></div>

18
project/templates/docs/parts/invoice_create_docs.html
Unescape View File

@ -1,21 +1,9 @@
{% url 'docs_aktrabot_add_by_invoice' invoice_id=obj.pk as url_aktrabot_by_invoice %}
{% url 'docs_nakladn_add_by_invoice' invoice_id=obj.pk as url_nakladn_by_invoice %}
{% url 'docs_faktura_add_by_invoice' invoice_id=obj.pk as url_faktura_by_invoice %}
<a href="{{ url_aktrabot_by_invoice }}" title="Акт по счёту" class="invoice-add-doc doc">Акт выполненных работ</a>
{% if obj.docs_for_invoice.AktRabot %}
{% for akt in obj.docs_for_invoice.AktRabot %}
<a href="{% url 'docs_aktrabot_img' akt.id %}" class="doc">{{ akt }}</a>
{% endfor %}
{% endif %}
<a href="{{ url_nakladn_by_invoice }}" title="Накладную" class="doc invoice-add-doc ">Накладную</a>
{% if obj.docs_for_invoice.Nakladn %}
{% for nakladn in obj.docs_for_invoice.Nakladn %}
<a href="{% url 'docs_nakladn_img' nakladn.id %}" class="doc">{{ nakladn }}</a>
{% endfor %}
{% endif %}
<a href="{{ url_faktura_by_invoice }}" title="Счёт-фактуру" class="invoice-add-doc doc">Счёт-фактуру</a>
{% if obj.docs_for_invoice.Faktura %}
{% for faktura in obj.docs_for_invoice.Faktura %}
<a href="{% url 'docs_faktura_img' faktura.id %}" class="doc">{{ faktura }}</a>
{% endfor %}
{% endif %}

13
project/templates/docs/parts/invoice_docs_list.html
Unescape View File

@ -0,0 +1,13 @@
<div class="doc-panel-header">Связанные документы</div>
{% for akt in obj.docs_for_invoice.AktRabot %}
<a href="{% url 'docs_aktrabot_img' akt.id %}" class="doc">{{ akt }}</a>
{% endfor %}
{% for nakladn in obj.docs_for_invoice.Nakladn %}
<a href="{% url 'docs_nakladn_img' nakladn.id %}" class="doc">{{ nakladn }}</a>
{% endfor %}
{% for faktura in obj.docs_for_invoice.Faktura %}
<a href="{% url 'docs_faktura_img' faktura.id %}" class="doc">{{ faktura }}</a>
{% endfor %}
Write Preview
Loading…
Cancel
Save