Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
E
esi-table-data
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
esi-data-scrapping
esi-table-data
Commits
b140af2f
Commit
b140af2f
authored
May 29, 2017
by
Vasyl Bodnaruk
Committed by
Andrii Marynets
May 29, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make task 1 and 2
parent
5524805f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
64 additions
and
22 deletions
+64
-22
style.css
esi/static/css/style.css
+4
-0
script.js
esi/static/js/script.js
+25
-1
list_news.html
esi/templates/list_news.html
+23
-16
views.py
esi/webapp/views.py
+12
-5
No files found.
esi/static/css/style.css
View file @
b140af2f
...
...
@@ -38,4 +38,8 @@
color
:
#025aa5
;
}
.container
{
margin-top
:
30px
;
}
esi/static/js/script.js
View file @
b140af2f
...
...
@@ -9,6 +9,7 @@ $(document).ready(function() {
var
chk
=
'.checkbox'
;
var
counter
=
'.actions-delete-counter'
;
var
deleteBtn
=
'.js-delete-items'
;
var
exportBtn
=
'.js-export-items'
// Action block
var
actionView
=
'.action-block-view'
;
...
...
@@ -49,6 +50,21 @@ $(document).ready(function() {
});
return
items
;
}
function
exportData
()
{
var
items
=
{
id
:
[],
type
:
'exportAll'
};
var
selectedLength
=
$
(
'.checkbox'
).
each
(
function
(
index
,
item
)
{
$
(
item
).
prop
(
'checked'
)
===
true
?
items
.
id
.
push
(
$
(
item
).
prop
(
'id'
))
:
''
});
console
.
log
(
items
);
return
items
;
}
function
getCookie
(
cname
)
{
var
name
=
cname
+
"="
;
var
ca
=
document
.
cookie
.
split
(
';'
);
...
...
@@ -79,6 +95,7 @@ $(document).ready(function() {
}
})
}
updateCounter
();
$
(
selectAllChk
).
click
(
function
()
{
$
(
chk
).
prop
(
'checked'
,
$
(
this
).
prop
(
'checked'
));
...
...
@@ -87,11 +104,18 @@ $(document).ready(function() {
$
(
chk
).
on
(
'click'
,
updateCounter
);
$
(
deleteBtn
).
on
(
'click'
,
function
()
{
$
(
deleteBtn
).
on
(
'click'
,
function
(
e
)
{
e
.
preventDefault
()
var
data
=
deleteData
();
ajaxPost
(
'/news/'
,
data
);
});
$
(
exportBtn
).
on
(
'click'
,
function
(
e
)
{
e
.
preventDefault
()
var
data
=
exportData
();
ajaxPost
(
'/news/'
,
data
);
});
$
(
actionView
).
on
(
'click'
,
function
(
e
)
{
e
.
preventDefault
();
var
data
=
actionData
(
this
);
...
...
esi/templates/list_news.html
View file @
b140af2f
...
...
@@ -8,27 +8,34 @@
</button>
<div
class=
"collapse navbar-collapse"
id=
"navbarTogglerDemo01"
>
<div
class=
"actions mr-auto"
>
<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"
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>
<div
style=
"display: block;"
>
<label>
Date from:
</label>
<input
type=
"date"
name=
"from_date"
>
</div>
<div
style=
"display: block;"
>
<label>
To:
</label>
<input
type=
"date"
name=
"to_date"
>
</div>
<div
style=
"display: block;"
>
<label>
By media:
</label>
<select
class=
"form-control actions-select"
name=
"media"
>
<option>
All
</option>
{% for i in media %}
<option>
{{ i.name }}
</option>
{% endfor %}
</select>
</div>
<button
type=
"submit"
class=
"btn btn-success"
>
Filter
</button>
</form>
</div>
<a
href=
"/"
class=
"btn btn-primary"
>
Add News
</a>
<button
class=
"js-delete-items btn btn-danger"
>
<span>
Delete news (
</span><span
class=
"actions-delete-counter"
>
0
</span><span>
)
</span>
</button>
<button
class=
"js-export-items btn btn-success"
>
<span>
Export news (
</span><span
class=
"actions-delete-counter"
>
0
</span><span>
)
</span>
</button>
</div>
</nav>
...
...
esi/webapp/views.py
View file @
b140af2f
import
json
from
django.shortcuts
import
render
,
redirect
,
reverse
,
HttpResponseRedirect
,
HttpResponse
from
django.views.generic
import
ListView
,
DetailView
,
CreateView
from
django.http
import
JsonResponse
from
.models
import
News
,
WpEsiNews
,
WpEsiNewsEntity
,
WpEsiMedia
,
WpEsiEntity
...
...
@@ -10,10 +11,16 @@ class ListNewsView(ListView):
def
get
(
self
,
request
,
*
args
,
**
kwargs
):
media
=
request
.
GET
.
get
(
'media'
)
date
=
request
.
GET
.
get
(
'date'
)
from_date
=
request
.
GET
.
get
(
'from_date'
)
to_date
=
request
.
GET
.
get
(
'to_date'
)
print
(
from_date
,
to_date
)
news
=
News
.
objects
.
filter
(
is_accepted
=
False
)
.
order_by
(
'-id'
)
#.order_by('record_date')
if
date
:
news
=
news
.
filter
(
record_date
=
date
)
if
from_date
:
news
=
news
.
filter
(
record_date__gte
=
from_date
)
print
(
news
)
if
to_date
:
news
=
news
.
filter
(
record_date__lte
=
to_date
)
print
(
news
)
if
media
:
news
=
self
.
_filter_by_media
(
news
,
media
)
media
=
WpEsiMedia
.
objects
.
all
()
...
...
@@ -28,8 +35,8 @@ class ListNewsView(ListView):
if
type_request
in
[
'delete'
,
'deleteAll'
]:
self
.
_delete
(
ids
)
if
type_request
==
'edit'
:
return
HttpResponse
Redirect
(
reverse
(
'single_news'
,
kwargs
=
{
'id'
:
ids
})
)
return
HttpResponse
Redirect
(
reverse
(
'list_news'
)
)
return
HttpResponse
({
'ids'
:
ids
}
)
return
HttpResponse
(
200
)
def
_delete
(
self
,
id
):
if
isinstance
(
id
,
list
):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment