Skip to content
Open

Test #91

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions first-project/first_project/app/views.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
from datetime import datetime
from os import listdir

from django.http import HttpResponse
from django.shortcuts import render, reverse

Expand All @@ -8,8 +11,8 @@ def home_view(request):
# функцию `reverse`
pages = {
'Главная страница': reverse('home'),
'Показать текущее время': '',
'Показать содержимое рабочей директории': ''
'Показать текущее время': reverse('time'),
'Показать содержимое рабочей директории': reverse('workdir')
}

# context и параметры render менять не нужно
Expand All @@ -23,7 +26,7 @@ def home_view(request):
def time_view(request):
# обратите внимание – здесь HTML шаблона нет,
# возвращается просто текст
current_time = None
current_time = datetime.now().strftime("%Y.%m.%d %H:%M:%S")
msg = f'Текущее время: {current_time}'
return HttpResponse(msg)

Expand All @@ -32,4 +35,8 @@ def workdir_view(request):
# по аналогии с `time_view`, напишите код,
# который возвращает список файлов в рабочей
# директории
raise NotImplemented
list_dir = listdir()
msg = ''
for item in list_dir:
msg = msg + '<p>' + item + '</p>'
return HttpResponse(msg)
7 changes: 3 additions & 4 deletions first-project/first_project/first_project/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,13 @@
from django.contrib import admin
from django.urls import path, include

from app.views import home_view

from app.views import home_view, time_view, workdir_view

urlpatterns = [
path('', home_view, name='home'),
# Раскомментируйте код, чтобы данные урлы
# обрабатывались Django
# path('current_time/', time_view, name='time'),
# path('workdir/', workdir_view, name='workdir'),
path('current_time/', time_view, name='time'),
path('workdir/', workdir_view, name='workdir'),
path('admin/', admin.site.urls),
]