Update layout
This commit is contained in:
Xavier Bustamante Talavera
parent
b391950d97
commit
84dd154cbe
|
|
@ -1,5 +1,7 @@
|
|||
from enum import Enum
|
||||
|
||||
import inflection
|
||||
|
||||
from ereuse_devicehub.resources.event import models as e
|
||||
|
||||
|
||||
|
|
@ -9,6 +11,9 @@ class State(Enum):
|
|||
"""Events participating in this state."""
|
||||
return (s.value for s in cls)
|
||||
|
||||
def __str__(self):
|
||||
return inflection.humanize(self.name)
|
||||
|
||||
|
||||
class Trading(State):
|
||||
Reserved = e.Reserve
|
||||
|
|
|
|||
|
|
@ -44,32 +44,17 @@
|
|||
</article>
|
||||
<article class="col-md-6">
|
||||
<h3>These are the specifications</h3>
|
||||
<ul class="list-unstyled">
|
||||
<li>
|
||||
<ul class="list-inline">
|
||||
{% if device.trading %}
|
||||
<li>
|
||||
{{ device.trading.name }}
|
||||
</li>
|
||||
{% endif %}
|
||||
{% if device.physical %}
|
||||
<li>
|
||||
{% if device.trading and device.physical %}
|
||||
and
|
||||
{% endif %}
|
||||
{% if device.phyisical %}
|
||||
{{ device.physical.name }}
|
||||
</li>
|
||||
{% endif %}
|
||||
</ul>
|
||||
</li>
|
||||
{% if device.physical_possessor %}
|
||||
<li>
|
||||
Physical possessor:
|
||||
{{ device.physical_possessor.name }},
|
||||
{{ device.physical_possessor.country.value }}
|
||||
</li>
|
||||
{% endif %}
|
||||
</ul>
|
||||
|
||||
<div class="table-responsive">
|
||||
<table class="table">
|
||||
<table class="table table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th></th>
|
||||
|
|
@ -80,10 +65,7 @@
|
|||
{% if device.processor_model %}
|
||||
<tr>
|
||||
<td>
|
||||
<details>
|
||||
<summary>CPU – {{ device.processor_model }}</summary>
|
||||
{{ macros.component_type(device.components, 'Processor') }}
|
||||
</details>
|
||||
CPU – {{ device.processor_model }}
|
||||
</td>
|
||||
<td>{{ device.rate.processor_range if device.rate }}</td>
|
||||
</tr>
|
||||
|
|
@ -91,10 +73,8 @@
|
|||
{% if device.ram_size %}
|
||||
<tr>
|
||||
<td>
|
||||
<details>
|
||||
<summary>RAM – {{ device.ram_size // 1000 }} GB</summary>
|
||||
RAM – {{ device.ram_size // 1000 }} GB
|
||||
{{ macros.component_type(device.components, 'RamModule') }}
|
||||
</details>
|
||||
</td>
|
||||
<td>{{ device.rate.ram_range if device.rate }}</td>
|
||||
</tr>
|
||||
|
|
@ -102,12 +82,9 @@
|
|||
{% if device.data_storage_size %}
|
||||
<tr>
|
||||
<td>
|
||||
<details>
|
||||
<summary>Data Storage – {{ device.data_storage_size // 1000 }} GB
|
||||
</summary>
|
||||
Data Storage – {{ device.data_storage_size // 1000 }} GB
|
||||
{{ macros.component_type(device.components, 'SolidStateDrive') }}
|
||||
{{ macros.component_type(device.components, 'HardDrive') }}
|
||||
</details>
|
||||
</td>
|
||||
<td>{{ device.rate.data_storage_range if device.rate }}</td>
|
||||
</tr>
|
||||
|
|
@ -115,10 +92,8 @@
|
|||
{% if device.graphic_card_model %}
|
||||
<tr>
|
||||
<td>
|
||||
<details>
|
||||
<summary>Graphics – {{ device.graphic_card_model }}</summary>
|
||||
Graphics – {{ device.graphic_card_model }}
|
||||
{{ macros.component_type(device.components, 'GraphicCard') }}
|
||||
</details>
|
||||
</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
|
|
@ -126,8 +101,7 @@
|
|||
{% if device.network_speeds %}
|
||||
<tr>
|
||||
<td>
|
||||
<details>
|
||||
<summary>Network –
|
||||
Network –
|
||||
{% if device.network_speeds[0] %}
|
||||
Ethernet
|
||||
{% if device.network_speeds[0] != None %}
|
||||
|
|
@ -143,9 +117,7 @@
|
|||
max. {{ device.network_speeds[1] }} Mbps
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
</summary>
|
||||
{{ macros.component_type(device.components, 'NetworkAdapter') }}
|
||||
</details>
|
||||
</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
|
|
@ -185,11 +157,10 @@
|
|||
</div>
|
||||
<h3>This is the traceability log of your device</h3>
|
||||
<div class="text-right">
|
||||
<small>Oldest one.</small>
|
||||
|
||||
<small>Latest one.</small>
|
||||
</div>
|
||||
<ol>
|
||||
{% for event in device.events %}
|
||||
{% for event in device.events|reverse %}
|
||||
<li>
|
||||
<strong>
|
||||
{{ event.type }}
|
||||
|
|
@ -207,11 +178,13 @@
|
|||
{% endfor %}
|
||||
</ol>
|
||||
<div class="text-right">
|
||||
<small>Latest one.</small>
|
||||
<small>Oldest one.</small>
|
||||
</div>
|
||||
</article>
|
||||
</div>
|
||||
<a href="https://www.ereuse.org/">
|
||||
<img class="img-responsive center-block" style="max-width: 30em;"
|
||||
src="{{ url_for('Device.static', filename='ereuse-logo.svg') }}">
|
||||
</a>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{% macro component_type(components, type) %}
|
||||
<ul class="list-unstyled">
|
||||
<ul>
|
||||
{% for c in components if c.t == type %}
|
||||
<li>
|
||||
{{ c.__format__('t') }}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ requests==2.19.1
|
|||
requests-mock==1.5.2
|
||||
SQLAlchemy==1.2.11
|
||||
SQLAlchemy-Utils==0.33.3
|
||||
teal==0.2.0a24
|
||||
teal==0.2.0a25
|
||||
webargs==4.0.0
|
||||
Werkzeug==0.14.1
|
||||
sqlalchemy-citext==1.3.post0
|
||||
|
|
|
|||
Reference in New Issue