diff --git a/main.py b/main.py index d0fe646..2ba7a98 100755 --- a/main.py +++ b/main.py @@ -438,12 +438,33 @@ def ip(last_byte): return redirect(url_for('ips')) else: ipmap = load_ips() + leases = load_leases() + lease = None + try: + if last_byte in leases: + lease = leases[last_byte] + today = time.localtime().tm_wday + expiry_t = time.localtime(int(lease[0])) + expiry_day = expiry_t.tm_wday + expiry_hour = time.strftime("%I:%M %p", expiry_t) + if today == expiry_day: + lease[0] = "las " + expiry_hour + elif (today + 1) % 7 == expiry_day: + lease[0] = "ma\N{LATIN SMALL LETTER N WITH TILDE}ana a las " + expiry_hour + else: + lease[0] = time.strftime("%B %d, ", expiry_t) + expiry_hour + except ValueError: + pass + except IndexError: + pass + addr = "{}.{}".format(ipmap["prefix"], last_byte) return render_template( "ip.html", addr=addr, valid_colors=valid_colors, meta=ipmap[last_byte], + lease=lease, ) @app.route("/logout") diff --git a/static/css/dpto2.css b/static/css/dpto2.css index 76b0af9..b732f2c 100644 --- a/static/css/dpto2.css +++ b/static/css/dpto2.css @@ -111,6 +111,11 @@ span.leased { font-size: x-small; } +div.lease { + color: #66bb6a; + margin-bottom: 5px; +} + div.ips-cell.dhcp-pool { background-color: #bed; } diff --git a/templates/ip.html b/templates/ip.html index 64c2555..44618d2 100644 --- a/templates/ip.html +++ b/templates/ip.html @@ -99,10 +99,25 @@ + + {% if lease %} +
+
+
+ + Otorgado a {{ lease[1] }} + {% if lease[3] != "*" %} ({{ lease[3] }}) {% endif %}
+ + hasta {{ lease[0] }} +
+
+
+ {% endif %} + {% if create_error %}

Error: {{ errormsg }}