remake pages

esi/static/js/script.js

@@ -75,7 +75,7 @@ $(document).ready(function() {
         contentType: "application/json; charset=utf-8",
         success: function (msg) {
             console.log(msg);
-            location.reload();
+            window.location.replace(window.location.href);
         }
     })
   }

esi/templates/list_news.html

@@ -11,20 +11,19 @@
             <button class="js-delete-items btn btn-danger">
                 <span>Delete items (</span><span class="actions-delete-counter">0</span><span>)</span>
             </button>
-            <form class="actions-form">
-                <select class="form-control actions-select">
-                    <option>Default</option>
-                    <option>2</option>
-                    <option>3</option>
-                    <option>4</option>
-                    <option>5</option>
-                </select>
-                <select class="form-control actions-select">
-                    <option>Default</option>
-                    <option>2</option>
-                    <option>3</option>
-                    <option>4</option>
-                    <option>5</option>
+            <form class="actions-form" method="get" action="{% url 'list_news' %}">
+                <!--<select class="form-control actions-select" name="time">-->
+                    <!--<option>All</option>-->
+                    <!--<option>Today</option>-->
+                    <!--<option>Last week</option>-->
+                    <!--<option>Last month</option>-->
+                <!--</select>-->
+                <input type="date" name="date">
+                <select class="form-control actions-select" name="media">
+                    <option>All</option>
+                    {% for i in media %}
+                        <option>{{ i.name }}</option>
+                    {% endfor %}
                 </select>
                 <button type="submit" class="btn btn-success">Filter</button>
             </form>

esi/templates/single_news.html

@@ -17,7 +17,7 @@
                 <div class="form-group row">
                     <label for="title" class="offset-1 col-2 col-form-label">Title</label>
                     <div class="col-6">
-                        <input class="form-control" type="text" placeholder="Some title..." id="title" name="title">
+                        <input class="form-control" type="text" placeholder="Some title..." id="title" name="title" value="{{ news.title }}">
                     </div>
                 </div>
 
@@ -26,7 +26,7 @@
                     <label for="description" class="offset-1 col-2 col-form-label">Description</label>
                     <div class="col-6">
                         <textarea class="form-control" type="text" placeholder="Some description..." id="description"
-                                  name="description"></textarea>
+                                  name="description">{{ news.description }}</textarea>
                     </div>
                 </div>
 
@@ -34,7 +34,7 @@
                 <div class="form-group row">
                     <label for="url" class="offset-1 col-2 col-form-label">Url</label>
                     <div class="col-6">
-                        <input class="form-control" type="text" placeholder="Some url..." id="url" name="url">
+                        <input class="form-control" type="text" placeholder="Some url..." id="url" name="url" value="{{ news.url }}">
                     </div>
                 </div>
                 <!-- Entity -->
@@ -42,7 +42,7 @@
                     <label for="entity" class="offset-1 col-2 col-form-label">Entity</label>
                     <div class="col-6">
                         <input class="form-control form-control-success" type="text" placeholder="Write entity..."
-                               id="entity" name="entity">
+                               id="entity" name="entity" value="{{ company.name }}">
                         <div class="form-control-feedback">Additional message</div>
                     </div>
                     <!--<div class="col-3">

esi/webapp/views.py

@@ -2,7 +2,6 @@ import json
 from django.shortcuts import render, redirect, reverse, HttpResponseRedirect, HttpResponse
 from django.views.generic import ListView, DetailView, CreateView
 
-
 from .models import News, WpEsiNews, WpEsiNewsEntity, WpEsiMedia, WpEsiEntity
 
 
@@ -10,13 +9,20 @@ class ListNewsView(ListView):
     template_name = 'list_news.html'
 
     def get(self, request, *args, **kwargs):
-        news = News.objects.filter(is_accepted=False).order_by('record_date').order_by('id')
-        return render(request, self.template_name, {'news': news})
+        media = request.GET.get('media')
+        date = request.GET.get('date')
+        news = News.objects.filter(is_accepted=False).order_by('-id')#.order_by('record_date')
+        if date:
+            news = news.filter(record_date=date)
+        if media:
+            news = self._filter_by_media(news, media)
+        media = WpEsiMedia.objects.all()
+        return render(request, self.template_name, {'news': news,
+                                                    'media': media})
 
     def post(self, request, *args, **kwargs):
         if request.is_ajax():
             data = json.loads(request.body.decode('utf-8'))
-            print(data)
             type_request = data['type']
             ids = data['id']
             if type_request in ['delete', 'deleteAll']:
@@ -31,6 +37,15 @@ class ListNewsView(ListView):
         else:
             News.objects.filter(id=id).update(is_accepted=True)
 
+    def _filter_by_media(self, news, media):
+        if media == 'All':
+            return news
+        else:
+            m = WpEsiMedia.objects.get(name=media)
+            news = news.filter(media_id=m.pk)
+            return news
+
+
 
 class DetailNewsView(DetailView):
     template_name = 'single_news.html'