промежуточные результаты (добавление строк в таблице Производственный план)
This commit is contained in:
@@ -68,3 +68,11 @@ class ProdTableForm(ModelForm):
|
|||||||
queryset = CostItem.objects.all(),
|
queryset = CostItem.objects.all(),
|
||||||
widget=RelatedFieldWidgetCanAdd(CostItem)
|
widget=RelatedFieldWidgetCanAdd(CostItem)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
class ProdPlanForm(ModelForm):
|
||||||
|
class Meta:
|
||||||
|
model = ProdPlan
|
||||||
|
fields = ['start_date', 'order', 'executor','action']
|
||||||
|
|
||||||
|
submit_text = "Добавить"
|
||||||
|
start_date = forms.DateField(widget = AdminDateWidget(format = '%d.%m.%Y'))
|
||||||
@@ -213,6 +213,7 @@ class ProdPlanTable(tables.Table):
|
|||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
attrs = {'class': 'paleblue'}
|
attrs = {'class': 'paleblue'}
|
||||||
|
template = 'asuzr/table_with_form.html'
|
||||||
|
|
||||||
class ProductionTable(tables.Table):
|
class ProductionTable(tables.Table):
|
||||||
cost_item = tables.Column(verbose_name = 'Комплектующие')
|
cost_item = tables.Column(verbose_name = 'Комплектующие')
|
||||||
|
|||||||
@@ -302,9 +302,13 @@ def prod_plan_view(request):
|
|||||||
|
|
||||||
table = ProdPlanTable(week_days.values())
|
table = ProdPlanTable(week_days.values())
|
||||||
title = u'Производственный план на %s - %s' % (sdate.strftime('%d.%m.%Y'), edate.strftime('%d.%m.%Y'))
|
title = u'Производственный план на %s - %s' % (sdate.strftime('%d.%m.%Y'), edate.strftime('%d.%m.%Y'))
|
||||||
form = DateForm({'date':curr_date})
|
date_form = DateForm({'date':curr_date})
|
||||||
|
add_form = ProdPlanForm()
|
||||||
RequestConfig(request).configure(table)
|
RequestConfig(request).configure(table)
|
||||||
return render(request, 'asuzr/table.html', {'table': table, 'title': title, 'dateform': form})
|
return render(request, 'asuzr/table.html', {'table': table, 'title': title, 'dateform': date_form, 'add_form': add_form, 'form_action' : 'add-plan-item'})
|
||||||
|
|
||||||
|
def prod_plan_add_item(request):
|
||||||
|
return redirect(prod_plan_view)
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
def log_view(request):
|
def log_view(request):
|
||||||
|
|||||||
@@ -82,13 +82,17 @@ USE_L10N = False
|
|||||||
|
|
||||||
USE_TZ = True
|
USE_TZ = True
|
||||||
|
|
||||||
DATE_FORMAT = 'd/m/Y'
|
DATE_FORMAT = 'd.m.Y'
|
||||||
|
|
||||||
|
DATE_INPUT_FORMATS = ('%d.%m.%Y',)
|
||||||
|
|
||||||
# Static files (CSS, JavaScript, Images)
|
# Static files (CSS, JavaScript, Images)
|
||||||
# https://docs.djangoproject.com/en/1.6/howto/static-files/
|
# https://docs.djangoproject.com/en/1.6/howto/static-files/
|
||||||
|
|
||||||
STATIC_URL = '/static/'
|
STATIC_URL = '/static/'
|
||||||
|
|
||||||
|
ADMIN_MEDIA_PREFIX = '/static/admin/'
|
||||||
|
|
||||||
TEMPLATE_DIRS = ('templates/')
|
TEMPLATE_DIRS = ('templates/')
|
||||||
|
|
||||||
TEMPLATE_CONTEXT_PROCESSORS += ('django.core.context_processors.request',
|
TEMPLATE_CONTEXT_PROCESSORS += ('django.core.context_processors.request',
|
||||||
|
|||||||
@@ -24,12 +24,14 @@ urlpatterns = patterns('',
|
|||||||
url(r'^sketches/(?P<order_id>\d+)/$', 'asuzr.views.sketches'),
|
url(r'^sketches/(?P<order_id>\d+)/$', 'asuzr.views.sketches'),
|
||||||
url(r'^sketches/delete/$', 'asuzr.views.delete_sketch', name = 'asuzr-del-sketch'),
|
url(r'^sketches/delete/$', 'asuzr.views.delete_sketch', name = 'asuzr-del-sketch'),
|
||||||
url(r'^prodplan/$', 'asuzr.views.prod_plan_view'),
|
url(r'^prodplan/$', 'asuzr.views.prod_plan_view'),
|
||||||
|
url(r'^prodplan/add_item/$', 'asuzr.views.prod_plan_add_item', name = 'add-plan-item'),
|
||||||
url(r'^admin/', include(admin.site.urls)),
|
url(r'^admin/', include(admin.site.urls)),
|
||||||
url(r'^log/$', 'asuzr.views.log_view'),
|
url(r'^log/$', 'asuzr.views.log_view'),
|
||||||
url(r'^inplaceeditform/', include('inplaceeditform.urls')),
|
url(r'^inplaceeditform/', include('inplaceeditform.urls')),
|
||||||
url(r'^accounts/login/$', login),
|
url(r'^accounts/login/$', login),
|
||||||
url(r'^accounts/logout/$', logout),
|
url(r'^accounts/logout/$', logout),
|
||||||
url(r'^jsi18n$', 'django.views.i18n.javascript_catalog', js_info_dict),
|
url(r'^jsi18n$', 'django.views.i18n.javascript_catalog', js_info_dict),
|
||||||
|
url(r'^admin/jsi18n', 'django.views.i18n.javascript_catalog'),
|
||||||
)
|
)
|
||||||
|
|
||||||
if settings.DEBUG:
|
if settings.DEBUG:
|
||||||
|
|||||||
@@ -24,6 +24,11 @@
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
{% if dateform %}
|
||||||
|
<script type="text/javascript" src="/admin/jsi18n/"></script>
|
||||||
|
<script type="text/javascript" src="/static/admin/js/core.js"></script>
|
||||||
|
{{ dateform.media }}
|
||||||
|
{% endif %}
|
||||||
<style>
|
<style>
|
||||||
#menu {
|
#menu {
|
||||||
margin: 0; /* Обнуляем значение отступов */
|
margin: 0; /* Обнуляем значение отступов */
|
||||||
|
|||||||
Reference in New Issue
Block a user