Pārlūkot izejas kodu

промежуточные результаты (добавление строк в таблице Производственный план)

Anastasia 10 gadi atpakaļ
vecāks
revīzija
3e43d35fc9
6 mainītis faili ar 27 papildinājumiem un 3 dzēšanām
  1. 8 0
      asuzr/forms.py
  2. 1 0
      asuzr/tables.py
  3. 6 2
      asuzr/views.py
  4. 5 1
      record/settings.py
  5. 2 0
      record/urls.py
  6. 5 0
      templates/asuzr/base.html

+ 8 - 0
asuzr/forms.py

@@ -68,3 +68,11 @@ class ProdTableForm(ModelForm):
 				    queryset = CostItem.objects.all(),
 				    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'))

+ 1 - 0
asuzr/tables.py

@@ -213,6 +213,7 @@ class ProdPlanTable(tables.Table):
 
   class Meta:
     attrs = {'class': 'paleblue'}
+    template = 'asuzr/table_with_form.html'
     
 class ProductionTable(tables.Table):
   cost_item = tables.Column(verbose_name = 'Комплектующие')

+ 6 - 2
asuzr/views.py

@@ -302,9 +302,13 @@ def prod_plan_view(request):
   
   table = ProdPlanTable(week_days.values())
   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)
-  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
 def log_view(request):

+ 5 - 1
record/settings.py

@@ -82,13 +82,17 @@ USE_L10N = False
 
 USE_TZ = True
 
-DATE_FORMAT = 'd/m/Y'
+DATE_FORMAT = 'd.m.Y'
+
+DATE_INPUT_FORMATS = ('%d.%m.%Y',)
 
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.6/howto/static-files/
 
 STATIC_URL = '/static/'
 
+ADMIN_MEDIA_PREFIX = '/static/admin/'
+
 TEMPLATE_DIRS = ('templates/')
 
 TEMPLATE_CONTEXT_PROCESSORS += ('django.core.context_processors.request',

+ 2 - 0
record/urls.py

@@ -24,12 +24,14 @@ urlpatterns = patterns('',
     url(r'^sketches/(?P<order_id>\d+)/$', 'asuzr.views.sketches'),
     url(r'^sketches/delete/$', 'asuzr.views.delete_sketch', name = 'asuzr-del-sketch'),
     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'^log/$', 'asuzr.views.log_view'),
     url(r'^inplaceeditform/', include('inplaceeditform.urls')),
     url(r'^accounts/login/$',  login),
     url(r'^accounts/logout/$', logout),
     url(r'^jsi18n$', 'django.views.i18n.javascript_catalog', js_info_dict),
+    url(r'^admin/jsi18n', 'django.views.i18n.javascript_catalog'),
 )
 
 if settings.DEBUG:

+ 5 - 0
templates/asuzr/base.html

@@ -24,6 +24,11 @@
 	      return false;
 	      }
   </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>
     #menu {
       margin: 0; /* Обнуляем значение отступов */