realtime_web Commit - r43:8d16e1ab9977

Fix breadcrum in header

Juan C. Espinoza -

r43:8d16e1ab9977

parent child

Context file:

r43:8d16e1ab9977

Collapse all files

plotter/static/css/header.css +10 -2

             #igp-top{
                 height:35px;
                 background-color: var(--primary);
             }
             #igp-top .navbar{
                 padding: 0 0;
             }
             .nav-social a {
                 text-align: center;
                 line-height: 23px;
                 width: 25px;
                 margin-right: 10px;
                 color: #fff !important;
             }
             .nav-social a:hover{
                 background-color: #277ea0;
             }
             .navbar {
                 padding: 7px 0;
             }
             .navbar-toggler-icon {
                 font-size: 0.75em;
                 padding-top: 5px;
                 }
             .nav-contacto{
                 margin-top: 5px;
                 display: contents;
             }
             .nav-contacto li{
                 font-size: 14px;
                 margin-left: 10px;
                 display: inline;
                 color: #fff;
             }
             .nav-contacto ul>li:last-of-type {
                 padding-left: 10px;
                 border-left: 1px solid white;
             }
             .nav-contacto li a{
                 color: #fff;
                 text-decoration: none;
             }
             .navbar-igp-1 {
                 display: contents;
             }
             .navbar-igp-1 .nav-link {
                 color: var(--secondary);
                 display: inline;
                 padding: 0;
             }
             .navbar-igp-1 li.active a,
             .navbar-igp-1 li a:hover {
               color: var(--tertiary);
             }
             .navbar-igp-1 li:after {
                 content: '|';
                 margin: 0.2em;
               }
             .navbar-igp-1 ul>li:last-of-type:after {
                 margin-right: 0;
             }
             #igp-bottom {
                 background-color: var(--bg-sections);
                 border-bottom: var(--bd-sections);
                 border-top: var(--bd-sections);
             }
             #igp-bottom .navbar {
                 padding: 7px 0;
             }
-            .navbar-igp-2 .nav-link {
+            .navbar-igp-2 .nav-link{
-                color: var(--tertiary);
+                color: var(--secondary);
                 display: inline;
                 padding: 0;
             }
+            .navbar-igp-2 ul>li:not(:first-of-type) a:hover{
+                color: var(--secondary);
+            }
+            .navbar-igp-2 li.active a {
+                color: var(--tertiary);
+            }
             .navbar-igp-2 ul>li:not(:first-of-type):before {
                 content: '|';
                 margin: 0.2em;
             }
             .logo{
                 height: 40px;
                 padding-right: 0.5em;
             }
             @media (max-width: 768px){
                 .logo{
                     height: 30px;
                 }
                 .navbar-igp-1 li:after {
                     content: '';
                   }
             }

plotter/templates/header_igp.html +7 -2

             {% load static %} {% load bootstrap4 %}
             <div id="igp-top">
                 <div class="container">
                     <nav class="navbar navbar-expand">
                         <div class="nav-social">
                             <ul class="navbar-nav mr-auto">
                                 <li class="nav-item">
                             <a target="_blank" href="https://www.facebook.com/igp.peru" class="nav-link">
                                 <i class="fab fa-facebook-f">
                                 </i></a></li>
                                 <li class="nav-item"><a target="_blank" href="https://twitter.com/igp_peru" class="nav-link">
                                 <i class="fab fa-twitter">
                                 </i></a></li>
                                 <li class="nav-item"><a target="_blank"
                                 href="https://www.linkedin.com/company/igpperu/" class="nav-link">
                                 <i class="fab fa-linkedin-in">
                                 </i></a></li>
                                 <li class="nav-item"><a target="_blank"
                                 href="https://www.instagram.com/igp.peru" class="nav-link">
                                 <i class="fab fa-instagram">
                                 </i></a></li>
                                 <li class="nav-item"><a target="_blank"
                                 href="https://www.youtube.com/igp_videos" class="nav-link">
                                 <i class="fab fa-youtube">
                                 </i></a></li>
                             </ul>
                         </div>
                         <div class="nav-contacto">
                             <ul class="navbar-nav ml-auto">
                                 <li class="d-none d-lg-inline nav-item">
                                     <span><i class="fa fa-phone"> </i> (511) 3172313</span>
                                 </li>
                                 <li class="d-none d-lg-inline nav-item">
                                     <a href="mailto:roj@igp.gob.pe">
                                         <span><i class="fa fa-envelope"> </i>&nbsp;roj@igp.gob.pe</span>
                                     </a>
                                 </li>
                                 <li class="nav-item">
                                     <a href="/login">
                                         <span><i class="fas fa-user"> </i>&nbsp;Login</span>
                                     </a>
                                 </li>
                             </ul>
                             </div>
                         </nav>
                     </div>
             </div>
             <div class="container">
                 <nav class="navbar navbar-expand-md">
                     <ul class="navbar-nav mr-auto">
                     <a class="nav-link"
                         href="/">
                     <img class="logo img-fluid" src="{% static 'images/logo-minan.png' %}"
                         alt="Logo Minam IGP">
                         <img class="logo img-fluid" src="{% static 'images/logo_igp_normal.png' %}" alt="Logo IGP">
                     </a>
                 </ul>
                     <button class="navbar-toggler" type="button" data-toggle="collapse"
                         data-target="#navbar-main"
                         aria-controls="navbar-main" aria-expanded="false"
                         aria-label="Toggle navigation">
                         <span class="navbar-toggler-icon">
                             <i class="fas fa-ellipsis-v" style="color:#444"></i>
                         </span>
                     </button>
                     <div id="navbar-main" class="navbar-collapse collapse">
                         <div class="navbar-igp-1">
                         <ul class="navbar-nav ml-auto">
                             <li class="nav-item {%if title == 'Home'%}active{%endif%}">
                                 <a class="nav-link"
                                     href="{% url 'url_main' %}">Home</a>
                             </li>
                             <li class="nav-item {%if title == 'Tools'%}active{%endif%}">
                                 <a class="nav-link"
                                     href="{% url 'url_tools' %}">Tools</a>
                             </li>
                             <li class="nav-item {%if title == 'Reports'%}active{%endif%}">
                                 <a class="nav-link"
                                     href="{% url 'url_reports' %}">Reports</a>
                             </li>
                             <li class="nav-item {%if title == 'About'%}active{%endif%}">
                                 <a class="nav-link"
                                     href="{% url 'url_about' %}">About</a>
                             </li>
                             <li class="nav-item">
                                 <a class="nav-link" href="http://jro.igp.gob.pe">JRO</a>
                             </li>
                         </ul>
                         </div>
                     </div>
                 </nav>
             </div>
             <div id="igp-bottom">
                 <div class="container">
                     <nav class="navbar navbar-expand">
                     <div class="navbar-igp-2">
                     <ul class="navbar-nav mr-auto">
-                        <li class="nav-item">
+                        <li class="nav-item active">
                             <a class="nav-link"
                                 href="https://www.gob.pe/igp"><span><i class="fas fa-home"> </i>&nbsp; IGP portal</span></a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link">Realtime at JRO</a>
+                            <a class="nav-link" href="{% url 'url_main'%}">Realtime at JRO</a>
+                        </li>
+                        {% if tag %}
+                        <li class="nav-item">
+                            <a class="nav-link" href="{% url 'url_main' tag %}">{{tag | title}}</a>
                         </li>
+                        {% endif %}
                         {% if title != 'Home' %}
                         <li class="nav-item">
                             <a class="nav-link">{{title}}</a>
                         </li>
                         {% endif %}
                     </ul>
                     </div>
                 </nav>
                 </div>
             </div>
             <br>

plotter/views.py +4 -1

             #!/usr/bin/python
             # -*- coding: UTF-8 -*-
             import os
             import time
             from datetime import datetime
             from django import forms
             from django.contrib import messages
             from django.utils.safestring import mark_safe
             from django.shortcuts import render
             from django.http import HttpResponse
             import mongoengine
             from plotter.models import Experiment, ExpDetail, PlotMeta, PlotData
             from utils.plots import skynoise_plot
             host = os.environ.get('HOST_MONGO', 'localhost')
             mongoengine.connect('dbplots', host=host, port=27017)
             # Forms
             class SearchForm(forms.Form):
                 experiment = forms.ChoiceField()
                 plot = forms.ChoiceField()
                 def __init__(self, *args, **kwargs):
                     exp_choices = kwargs.pop('exp_choices', [])
                     plt_choices = kwargs.pop('plt_choices', [])
                     super(SearchForm, self).__init__(*args, **kwargs)
                     self.fields['experiment'].choices = [(0, 'Select Experiment')] + exp_choices
                     self.fields['plot'].choices = [(0, 'Select Plot')] + plt_choices
             # we use this class to change the parameter in Scatter plot using the function plotly.restyle in jroplot.js
             class ScatterSetupForm(forms.Form):
                 plotdiv = forms.CharField(widget=forms.HiddenInput())
                 ymax = forms.CharField(initial=30)
                 ymin = forms.CharField(initial=10)
             # we use this class to change the parameter in RTI plot using the function plotly.restyle in jroplot.js
             class RTISetupForm(forms.Form):
                 plotdiv = forms.CharField(widget=forms.HiddenInput())
                 colormap = forms.ChoiceField(choices=[('Jet', 'Jet'), ('Viridis', 'Viridis'), ('RdBu', 'RdBu')])
                 zmax = forms.CharField(initial=30)
                 zmin = forms.CharField(initial=10)
                 ymax = forms.CharField(initial=180)
                 ymin = forms.CharField(initial=80)
             # we use this class to change the parameter in SPC plot using the function plotly.restyle in jroplot.js
             class SPCSetupForm(forms.Form):
                 plotdiv = forms.CharField(widget=forms.HiddenInput())
                 colormap = forms.ChoiceField(choices=[('Jet', 'Jet'), ('Viridis', 'Viridis'), ('RdBu', 'RdBu')])
                 #como es un perfil xmin y xmax deben ser iguales a zmin y zmax
                 xmax = forms.CharField(initial=30)
                 xmin = forms.CharField(initial=10)
                 #x2max = forms.CharField(initial=30)
                 #x2min = forms.CharField(initial=10)
                 ymax = forms.CharField(initial=180)
                 ymin = forms.CharField(initial=80)
                 zmax = forms.CharField(initial=30)
                 zmin = forms.CharField(initial=10)
             # Create your views here.
             def main(request, tag=None):
                 kwargs = {}
                 date = request.GET.get('date', datetime.now().strftime('%d-%m-%Y'))
                 exps = ExpDetail.objects(date=datetime.strptime(date, '%d-%m-%Y'))
                 tmp = {}
                 for exp in exps:
                     label = exp.tag.lower().strip() if exp.tag else 'other'
                     if label in tmp:
                         tmp[label] += 1
                     else:
                         tmp[label] = 1
                 tags = []
                 for key, value in tmp.items():
                     if tag == key:
                         tags.append({'name': key, 'n': tmp[key], 'active': 'active'})
                     else:
                         tags.append({'name': key, 'n': tmp[key]})
                 kwargs['tags'] = tags
                 if tag:
                     experiments = []
                     for exp in exps:
                         label = exp.tag.lower().strip() if exp.tag else 'other'
                         if label != tag:
                             continue
                         dum = {}
                         dum['code'] = exp.experiment.code
                         dum['plots'] = []
                         dum['name'] = exp.experiment.name
                         dt = datetime.now()
                         t = time.mktime(dt.timetuple())
                         t -= 5*60*60
                         if (t-exp['last_time']) > 6*exp['interval']:
                             status = 'Offline'
                             clase = 'alertas-offline'
                             style = 'danger'
                             lastDataDate = exp['last_time']
                         elif (t-exp['last_time']) > 3*exp['interval']:
                             status = 'Delayed'
                             clase = 'alertas-delayed'
                             style = 'warning'
                             lastDataDate = exp['last_time']
                         else:
                             status = 'Online'
                             clase = 'alertas-online'
                             style = 'success'
                             lastDataDate = exp['last_time']
                         dum['status'] = status
                         dum['class'] = clase
                         dum['style']= style
                         dum['date']= datetime.utcfromtimestamp(lastDataDate)
                         for plot in exp.plots():
                             dum['plots'].append({'plot': plot.plot, 'name': plot.plot.replace('_', ' ').title(), 'id':plot.id})
                         experiments.append(dum)
                     kwargs['experiments'] = experiments
+                    kwargs['tag'] = tag
                 kwargs['date'] = date
                 kwargs['title'] = 'Home'
                 kwargs['sidebar'] = True
                 return render(request, 'home.html', kwargs)
             def about(request):
                 '''
                 '''
                 kwargs = {
                     'title': 'About'
                 }
                 return render(request, 'about.html', kwargs)
             def tools(request):
                 '''
                 '''
                 kwargs = {
                     'title': 'Tools'
                 }
                 return render(request, 'tools.html', kwargs)
             def reports(request):
                 '''
                 '''
                 kwargs = {
                     'title': 'Reports',
                 }
                 return render(request, 'reports.html', kwargs)
             def plot(request, code=None, plot=None):
                 '''
                 '''
                 realtime = False
                 date = request.GET.get('date', None)
                 if date is None:
                     date = datetime.now().strftime('%d-%m-%Y')
                     realtime = True
                 exp = Experiment.objects.get(code=int(code))
                 detail = ExpDetail.objects.get(experiment=exp, date=datetime.strptime(date, '%d-%m-%Y'))
                 meta = PlotMeta.objects.get(exp_detail=detail, plot=plot)
+                tag = detail.tag.lower().strip() if detail.tag else 'other'
                 kwargs = {
                     'code': code,
                     'plot': plot,
                     'meta':meta,
                     'date': date,
                     'id': meta.pk,
                     'realtime': realtime,
                     'title': 'Home',
                     'name' : exp.name,
                     'sidebar': True,
+                    'tag' : tag,
                     'plots': []
                 }
                 for plt in detail.plots():
                     kwargs['plots'].append({'plot': plt.plot, 'name': plt.plot.replace('_', ' ').title()})
                 # Logic to show my views
                 if meta.metadata['type'] == 'pcolorbuffer':
                     kwargs['setup_form'] = RTISetupForm()
                     kwargs['fn_plot'] = 'PcolorBuffer'
                     return render(request, 'plot.html', kwargs)
                 elif meta.metadata['type'] == 'pcolor':
                     kwargs['setup_form'] = SPCSetupForm()
                     kwargs['fn_plot'] = 'Pcolor'
                     return render(request, 'plot.html', kwargs)
                 elif meta.metadata['type'] == 'scatterbuffer':
                     kwargs['setup_form'] = ScatterSetupForm()
                     kwargs['fn_plot'] = 'ScatterBuffer'
                     return render(request, 'plot.html', kwargs)
                 elif meta.metadata['type'] == 'image':
                     kwargs['image'] = True
                     kwargs['fn_plot'] = 'StaticPlot'
                     return render(request, 'plot.html', kwargs)
                 else:
                     return render(request, 'home.html', {})
             def plot_skynoise(request):
                 date = request.GET.get('date', None)
                 if date is None:
                     date = datetime.now()
                 else:
                     date = datetime.strptime(date, '%Y-%m-%d')
                 data = skynoise_plot(date.year, date.month, date.day)
                 response = HttpResponse(data.getvalue(), content_type='image/png')
                 return response
             def plot_overjro(request):
                 date = request.GET.get('date', None)
                 if date is None:
                     date = datetime.now()
                 else:
                     date = datetime.strptime(date, '%Y-%m-%d')
                 data = skynoise_plot(date.year, date.month, date.day)
                 response = HttpResponse(data.getvalue(), content_type='image/png')
                 return response

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages