Skip to content

m3_webInterface
m3_webInterface
Commit 2c70d94a authored by Mario Chirinos Colunga's avatar Mario Chirinos Colunga
Browse files
Options

update 2019

parent fed7af4d
Show whitespace changes
Inline Side-by-side
Showing with 48 additions and 17 deletions
catalog/management/commands/report.py
View file @ 2c70d94a
......@@ -42,8 +42,15 @@ class Command(BaseCommand):
print(t.name + ", " + t.url + ", " + str(newsP.count()) +", "+ newsP[0].date.date().strftime('%d/%m/%Y') )
print("=======================================================")
audioSources = Publisher.objects.all().filter(type="audio")
data["audioTime"]=0
for a in audioSources:
print(a.name + ", " + a.url + ", " + str(audioTime.objects.all().filter(publisher=a)[0].minutes ))
if audioTime.objects.all().filter(publisher=a).count() <=0:
print ("No adutioTime for: ", a)
else:
minutes = audioTime.objects.all().filter(publisher=a)[0].minutes
print(a.name + ", " + a.url + ", " + str(minutes))
data["audioTime"]+=minutes
print(data)
with open(options['json'][0], 'w') as outfile:
json.dump(data, outfile)
outfile.write("m3Data="+json.dumps(data)+";")
outfile.close()
catalog/management/commands/updateDB.py
View file @ 2c70d94a
......@@ -18,10 +18,12 @@ class Command(BaseCommand):
def handle(self, *args, **options):
if False:
if True:
#update radio stations recotding time
print("Recording Time:")
recordingsDir = "/home/mario/virtualHDD/m3/recordings/"
# recordingsDir = "/home/mario/virtualHDD/m3/recordings/"
recordingsDir = "/home/mario/NASM3/recordings/"
audioTime.objects.all().delete()
publishers = Publisher.objects.all().filter(type="audio")
for p in publishers:
......@@ -83,6 +85,9 @@ class Command(BaseCommand):
news.date = newsDate
news.save()
if "topic" not in d:
d['topic']=""
if d['topic'] == "" or d['topic'] == None or d['topic'] ==[]:
d['topic'] = "Sin Tema"
......
catalog/static/js/data.js 0 → 100644
View file @ 2c70d94a
m3Data={"users": 15, "publishers": 70, "text": 59, "audio": 11, "documents": 3451669, "searches": 373, "audioTime": 2841541};
\ No newline at end of file
catalog/templatetags/app_filters.py
View file @ 2c70d94a
......@@ -11,4 +11,8 @@ def highlight(text, word):
result = pattern.sub(r'<b>\1</b>',text)
return mark_safe(result)
@register.simple_tag
def random_int(a, b=None):
if b is None:
a, b = 0, a
return random.randint(a, b)
out.js 0 → 100644
View file @ 2c70d94a
m3Data={"users": 14, "publishers": 58, "text": 48, "audio": 10, "documents": 3027598, "searches": 362};
\ No newline at end of file
out.json 0 → 100644
View file @ 2c70d94a
{"users": 14, "publishers": 58, "text": 48, "audio": 10, "documents": 3027352, "searches": 362}
\ No newline at end of file
templates/registration/login.html
View file @ 2c70d94a
......@@ -4,6 +4,7 @@
{% block headMedia %}
<link rel="stylesheet" href="{% static 'css/login.css'%}" type="text/css">
<script type="text/javascript" src="{% static 'js/data.js' %}" ></script>
{% endblock %}
......@@ -33,7 +34,7 @@
<i class="fa fa-rss fa-5x"></i>
</div>
<div class="col-xs-9 text-right">
<div class="huge">45</div>
<div class="huge" id="textMedia"></div>
<div>Medios Impresos</div>
</div>
</div>
......@@ -48,7 +49,7 @@
<i class="fa fa-microphone fa-5x"></i>
</div>
<div class="col-xs-9 text-right">
<div class="huge">9</div>
<div class="huge" id="audioMedia"></div>
<div>Estaciones de Radio</div>
</div>
</div>
......@@ -63,7 +64,7 @@
<i class="fa fa-volume-up fa-5x"></i>
</div>
<div class="col-xs-9 text-right">
<div class="huge">30,380</div>
<div class="huge" id="audioTime"></div>
<div>Horas de Audio</div>
</div>
</div>
......@@ -83,7 +84,7 @@
<i class="fa fa-file-text fa-5x"></i>
</div>
<div class="col-xs-9 text-right">
<div class="huge">2,291,202</div>
<div class="huge" id="documents"></div>
<div>Noticias</div>
</div>
</div>
......@@ -101,7 +102,7 @@
<i class="fa fa-search fa-5x"></i>
</div>
<div class="col-xs-9 text-right">
<div class="huge">197</div>
<div class="huge" id="searches"></div>
<div>Busquedas</div>
</div>
......@@ -193,7 +194,7 @@
<i class="fa fa-user fa-5x"></i>
</div>
<div class="col-xs-9 text-right">
<div class="huge">10</div>
<div class="huge" id="users"></div>
<div>Usuarios</div>
</div>
</div>
......@@ -210,6 +211,7 @@
<div class="row geointInfo" >
<div class="col-md-4">
......@@ -248,15 +250,21 @@
}
vid.addEventListener('ended', function()
{
{ document.getElementById("audioMedia").innerHTML=m3Data.audio;
// only functional if "loop" is removed
vid.pause();
// to capture IE10
vidFade();
});
document.getElementById("textMedia").innerHTML=m3Data.text;
document.getElementById("audioMedia").innerHTML=m3Data.audio;
audioTime = Math.ceil(m3Data.audioTime/60).toString();
document.getElementById("audioTime").innerHTML=new Intl.NumberFormat('es-MX').format(audioTime);
documents = m3Data.documents;
document.getElementById("documents").innerHTML=new Intl.NumberFormat('es-MX').format(documents);
document.getElementById("searches").innerHTML=m3Data.searches;
document.getElementById("users").innerHTML=m3Data.users;
</script>
{% endblock %}
update.sh 0 → 100644
View file @ 2c70d94a
#!/bin/sh
python3 manage.py updateDB /home/mario/virtualHDD/m3/noticias/
python3 manage.py report catalog/static/js/data.js
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