Commit fe43e886 authored by Mario Chirinos Colunga's avatar Mario Chirinos Colunga 💬

update

parent 7446a45e
...@@ -53,6 +53,8 @@ class Command(BaseCommand): ...@@ -53,6 +53,8 @@ class Command(BaseCommand):
# else: # else:
# date = d['date'] # date = d['date']
# newsDate = datetime.datetime.strptime(date, "%Y-%m-%d") # newsDate = datetime.datetime.strptime(date, "%Y-%m-%d")
# print d['date']
# print d['title']
newsDate = dateutil.parser.parse(d['date']) newsDate = dateutil.parser.parse(d['date'])
......
# -*- coding: utf-8 -*-
# Generated by Django 1.11.7 on 2017-11-26 01:09
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('catalog', '0005_auto_20170819_2050'),
]
operations = [
migrations.AlterField(
model_name='publisher',
name='crawler',
field=models.CharField(default=b'', max_length=64),
),
]
...@@ -7,7 +7,7 @@ from django.contrib.postgres.indexes import GinIndex ...@@ -7,7 +7,7 @@ from django.contrib.postgres.indexes import GinIndex
class Publisher(models.Model): class Publisher(models.Model):
name = models.CharField(max_length=128) name = models.CharField(max_length=128)
shortName = models.CharField(max_length=32, default="") shortName = models.CharField(max_length=32, default="")
crawler = models.CharField(max_length=32, default="") crawler = models.CharField(max_length=64, default="")
type = models.CharField(max_length=32, default='') type = models.CharField(max_length=32, default='')
url = models.URLField(default="") url = models.URLField(default="")
......
No preview for this file type
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<tbody> <tbody>
{% for p in publishers %} {% for p in publishers %}
<tr class="odd gradeX"> <tr class="odd gradeX">
<td>{{p.name}}</td> <td><a href="{% url 'audio'%}{{p.shortName}}">{{p.name}}</a></td>
<td>{{p.shortName}}</td> <td>{{p.shortName}}</td>
<td><a href="{{p.url}}" target="blank">{{p.url}}</a></td> <td><a href="{{p.url}}" target="blank">{{p.url}}</a></td>
<td>{{p.date}}</td> <td>{{p.date}}</td>
......
{% extends "base_generic.html" %}
{% load humanize %}
{% block dash-title %}
<b>{{publisher.name}}</b>
{% endblock %}
{% block dash %}
<!-- /.row -->
<div class="row">
<div class="col-lg-12">
<div class="panel panel-default">
<div class="panel-heading">
{{publisher.name}}
</div>
<!-- /.panel-heading -->
<div class="panel-body">
<div id="cal1">holas</div>
<!-- /.table-responsive -->
</div>
<!-- /.panel-body -->
</div>
<!-- /.panel -->
</div>
<!-- /.col-lg-12 -->
</div>
<!-- /.row -->
{% endblock %}
{% block scripts %}
<script>
$(document).ready(function() {
$('#dataTables-example').DataTable({
responsive: true,
"language": {"url": "/static/languages/Spanish.json" }
});
});
</script>
{% endblock %}
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
</div> </div>
</div> </div>
</div> </div>
<a href="{% url 'audio-list'%}?{{ request.GET.urlencode }}"> <a href="{% url 'audio'%}">
<div class="panel-footer"> <div class="panel-footer">
<span class="pull-left">Ver lista</span> <span class="pull-left">Ver lista</span>
<span class="pull-right"><i class="fa fa-arrow-circle-right"></i></span> <span class="pull-right"><i class="fa fa-arrow-circle-right"></i></span>
......
...@@ -12,7 +12,8 @@ urlpatterns = [ ...@@ -12,7 +12,8 @@ urlpatterns = [
url(r'^ws/news/$', views.wsNewsList, name='ws-news-list'), url(r'^ws/news/$', views.wsNewsList, name='ws-news-list'),
url(r'^ws/graphs/$', views.wsGraphs, name='ws-graphs'), url(r'^ws/graphs/$', views.wsGraphs, name='ws-graphs'),
url(r'^ws/download/$', views.wsDownloadNews, name='ws-download-news'), url(r'^ws/download/$', views.wsDownloadNews, name='ws-download-news'),
url(r'^audio/$', views.audioList, name='audio-list'), url(r'^audio/$', views.audioList, name='audio'),
url(r'^audio/(?P<publisher>\w+)$', views.audioPublisher, name='audio'),
] ]
No preview for this file type
...@@ -238,5 +238,12 @@ def audioList(request): ...@@ -238,5 +238,12 @@ def audioList(request):
publishers = Publisher.objects.all().filter( type="audio") publishers = Publisher.objects.all().filter( type="audio")
return render(request,'audioList.html',{"form":form, "publishers":publishers}) return render(request,'audioList.html',{"form":form, "publishers":publishers})
#-------------------------------------------------------------------------------
def audioPublisher(request, publisher):
form = SearchForm(request.GET)
info=dict()
if Publisher.objects.all().filter(shortName=publisher).count() > 0:
p = Publisher.objects.all().filter(shortName=publisher)[0]
return render(request,'audioPlay.html',{"form":form, "publisher":p})
No preview for this file type
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment