mitri4
/
skill-back
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

исправленны пути в media

Browse Source
remotes/origin/pm_task_31703
andrey 8 years ago
parent a0a04af617
commit 882954901c
2 changed files with 13 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      analytics/views.py
  2. 2
      templates/analytics/base.html

16
analytics/views.py
Unescape View File

@ -28,10 +28,10 @@ def index_view_decor(url):
res1 = [] res1 = []
for i in row: for i in row:
k = i.split("$-$") k = i.split("$-$")
k = {'value': k[0], 'background': 'none'} if len(i.split("$-$")) == 1 else {'value': k[0], k = {'value': k[0], 'background': 'none'}\
'background': k[ if len(i.split("$-$")) == 1 else {'value': k[0],'background': k[1]}
1]}
res1.append(k) res1.append(k)
res.append(res1) res.append(res1)
for i in res: for i in res:
for j in range(max - len(i)): for j in range(max - len(i)):
@ -44,7 +44,15 @@ def index_view_decor(url):
date_create = time.ctime(os.stat(path).st_atime) date_create = time.ctime(os.stat(path).st_atime)
context = {'body': res, 'header': first, 'date_create': date_create, 'start': start, 'end': end} context = {
'body': res,
'header': first,
'date_create': date_create,
'start': start,
'end': end,
'url': url,
}
context.update(func()) context.update(func())
return render(request, url[1:-1] + '.html', context=context) return render(request, url[1:-1] + '.html', context=context)

2
templates/analytics/base.html
Unescape View File

@ -7,7 +7,7 @@
<body> <body>
<h2>Дата создания отчёта {{ date_create }}</h2> <h2>Дата создания отчёта {{ date_create }}</h2>
<button><a href="new?start={{ start }}&end={{ end }}">Сгенирировать отчёт</a></button> <button><a href="new?start={{ start }}&end={{ end }}">Сгенирировать отчёт</a></button>
<button style="margin-bottom: 20px"><a href="/media/analytics/theme/s{{ start }}e{{ end }}progress.csv">Скачать отчёт</a></button> <button style="margin-bottom: 20px"><a href="/media{{ url }}s{{ start }}e{{ end }}progress.csv">Скачать отчёт</a></button>
<button><a href="/analytics">На главную</a></button> <button><a href="/analytics">На главную</a></button>
<form action=""> <form action="">
<label>от</label> <label>от</label>

Write Preview
Loading…
Cancel
Save