diff --git a/movere_local/mainapp/admin.py b/movere_local/mainapp/admin.py index 8c38f3f3dad51e4585f3984282c2a4bec5349c1e..2655bed6ed615959ba96a400ceec145354f9e033 100644 --- a/movere_local/mainapp/admin.py +++ b/movere_local/mainapp/admin.py @@ -1,3 +1,6 @@ from django.contrib import admin +from .models import EditRequest, IncomingEditRequest # Register your models here. +admin.site.register(EditRequest) +admin.site.register(IncomingEditRequest) diff --git a/movere_local/mainapp/models.py b/movere_local/mainapp/models.py index 6924eb93e4fd6afcaa173d5242bfa91d779f289b..ec9c4e99d05d60b4b82ebc8dab66afd5db29512b 100644 --- a/movere_local/mainapp/models.py +++ b/movere_local/mainapp/models.py @@ -19,7 +19,7 @@ class EditRequest(models.Model): req_datetime = models.DateTimeField(auto_now_add=True) # Дата Рё время создания заказа user = models.ForeignKey(User, on_delete=models.CASCADE) # РЎРІСЏР·СЊ СЃ пользователем req_parameters = models.TextField(default='no parameters') # Параметры заказа - file_path = models.CharField(max_length=255, blank=True, null=True) # Путь Рє файлу + file_path = models.CharField(max_length=255, blank=True, null=True) # Путь Рє файлу, отправлен пользователем req_state = models.CharField( max_length=50, default='in_progress', diff --git a/movere_local/mainapp/templates/mainapp/view_editrequests.html b/movere_local/mainapp/templates/mainapp/view_editrequests.html index 1b76a82026cc94eb6503dc9810e37705335378fa..2f7f9439b11e768aacac066b84b28f0ea8c6f2d6 100644 --- a/movere_local/mainapp/templates/mainapp/view_editrequests.html +++ b/movere_local/mainapp/templates/mainapp/view_editrequests.html @@ -56,11 +56,10 @@ {% for order in orders %} <li> Заказ ID: {{ order.id }} <br> - Дата: {{ order.order_datetime }} <br> - Параметры: {{ order.order_parameters }} <br> - Файл: {% if order.file_basename %}{{ order.file_basename }}{% else %}Нет файла{% endif %} <br> - - + Дата: {{ order.req_datetime }} <br> + Параметры: {{ order.req_parameters }} <br> + Отправленный файл: {% if order.sent_by_user %}{{ order.sent_by_user }}{% else %}Нет файла{% endif %} <br> + Полученный файл: {% if order.recieved_from_server %}{{ order.recieved_from_server }}{% else %}Нет файла{% endif %} <br> </li> {% endfor %} </ul> diff --git a/movere_local/mainapp/views.py b/movere_local/mainapp/views.py index d25e13867293c6a55e58061372d53015dfbe9e72..ed8658088dc6886585ab8daa7454af52f9d2e97b 100644 --- a/movere_local/mainapp/views.py +++ b/movere_local/mainapp/views.py @@ -523,11 +523,16 @@ def view_editrequests(request): orders = reqs_by_status[status] for order in orders: # Рзвлекаем только basename РёР· файловых путей + if order.file_path: + order.sent_by_user = os.path.basename(order.file_path) + else: + order.sent_by_user = [] + if order.received_file: - order.file_basename = os.path.basename(order.received_file) - + order.recieved_from_server = os.path.basename(order.received_file) else: - order.file_basename = [] + order.recieved_from_server = [] + orders_status_list.append((status, orders)) return render(request, 'mainapp/view_editrequests.html', {'orders_status_list': orders_status_list}) \ No newline at end of file