| - | Range | -
|---|---|
|
-
-
- CPU – {{ device.processor_model }}- {{ macros.component_type(device.components, 'Processor') }} - |
- - |
|
-
-
- RAM – {{ device.ram_size // 1000 }} GB- {{ macros.component_type(device.components, 'RamModule') }} - |
- //range// | -
|
-
-
- Data Storage – {{ device.data_storage_size // 1000 }} GB- {{ macros.component_type(device.components, 'SolidStateDrive') }} - {{ macros.component_type(device.components, 'HardDrive') }} - |
- //range// | -
|
-
-
- Graphics – {{ device.graphic_card_model }}- {{ macros.component_type(device.components, 'GraphicCard') }} - |
- //range// | -
|
-
-
- Network – - {% if device.network_speeds[0] %} - Ethernet of {{ device.network_speeds[0] }} Mbps - {% endif %} - {% if device.network_speeds[0] and device.network_speeds[1] %} - + - {% endif %} - {% if device.network_speeds[1] %} - WiFi of {{ device.network_speeds[1] }} Mbps - {% endif %} -- {{ macros.component_type(device.components, 'NetworkAdapter') }} - |
- - |
{{ device.__format__('t') }} - {{ device.__format__('s') }} -
+ +
+  }})
+
+
+
+ {{ device.__format__('t') }}
+
+{{ device.__format__('t') }}
+ {{ device.__format__('s') }}
+
+
+
+ This is your {{ device.t }}. +
-
-
-
-
-
-
-
+
diff --git a/ereuse_devicehub/resources/device/templates/devices/macros.html b/ereuse_devicehub/resources/device/templates/devices/macros.html
index ba9c9969..9d13c11b 100644
--- a/ereuse_devicehub/resources/device/templates/devices/macros.html
+++ b/ereuse_devicehub/resources/device/templates/devices/macros.html
@@ -1,10 +1,10 @@
{% macro component_type(components, type) %}
- + {% if device.trading %} + {{ device.trading }} + {% endif %} + {% if device.trading and device.physical %} + and + {% endif %} + {% if device.physical %} + {{ device.physical }} + {% endif %} +
+
+
+
+
+
+
You can verify the originality of your device.
+
+ If your device comes with the following tag
+  }})
+ it means it has been refurbished by an eReuse.org
+ certified organization.
+
+ The tag is special –illuminate it with the torch of
+ your phone for 6 seconds and it will react like in
+ the following image:
+  }})
+ This is proof that this device is genuine.
+
These are the specifications
+
+
+
+
+
+ | + | Range | +
|---|---|
| + CPU – {{ device.processor_model }} + | ++ {% if device.rate %} + {{ device.rate.processor_range }} + ({{ device.rate.processor }}) + {% endif %} + | +
| + RAM – {{ device.ram_size // 1000 }} GB + {{ macros.component_type(device.components, 'RamModule') }} + | ++ {% if device.rate %} + {{ device.rate.ram_range }} + ({{ device.rate.ram }}) + {% endif %} + | +
| + Data Storage – {{ device.data_storage_size // 1000 }} GB + {{ macros.component_type(device.components, 'SolidStateDrive') }} + {{ macros.component_type(device.components, 'HardDrive') }} + | ++ {% if device.rate %} + {{ device.rate.data_storage_range }} + ({{ device.rate.data_storage }}) + {% endif %} + | +
| + Graphics – {{ device.graphic_card_model }} + {{ macros.component_type(device.components, 'GraphicCard') }} + | ++ |
| + Network – + {% if device.network_speeds[0] %} + Ethernet + {% if device.network_speeds[0] != None %} + max. {{ device.network_speeds[0] }} Mbps + {% endif %} + {% endif %} + {% if device.network_speeds[0] and device.network_speeds[1] %} + + + {% endif %} + {% if device.network_speeds[1] %} + WiFi + {% if device.network_speeds[1] != None %} + max. {{ device.network_speeds[1] }} Mbps + {% endif %} + {% endif %} + {{ macros.component_type(device.components, 'NetworkAdapter') }} + | ++ |
| + Total rate + | ++ {{ device.rate.rating_range }} + ({{ device.rate.rating }}) + | +
| + Algorithm price + | ++ {{ device.rate.price }} + | +
| + Actual price + | ++ {{ device.price }} + | +
This is the traceability log of your device
+
+ Latest one.
+
+ -
+ {% for event in device.events|reverse %}
+
-
+
+ {{ event.type }}
+
+ —
+ {{ event }}
+
++ + {{ event._date_str }} + ++ +
+ {% endfor %}
+
+ Oldest one.
+
+ -
+
-
- {{ c.__format__('t') }}
+ {{ c.__format__('t') }}
- {{ c.__format__('s') }} + {{ c.__format__('s') }}
{% endfor %}
diff --git a/ereuse_devicehub/resources/enums.py b/ereuse_devicehub/resources/enums.py
index 41b561d8..de99d8f7 100644
--- a/ereuse_devicehub/resources/enums.py
+++ b/ereuse_devicehub/resources/enums.py
@@ -2,6 +2,8 @@ from distutils.version import StrictVersion
from enum import Enum, IntEnum, unique
from typing import Union
+import inflection
+
@unique
class SnapshotSoftware(Enum):
@@ -11,6 +13,9 @@ class SnapshotSoftware(Enum):
Web = 'Web'
DesktopApp = 'DesktopApp'
+ def __str__(self):
+ return self.name
+
@unique
class RatingSoftware(Enum):
@@ -25,6 +30,9 @@ class RatingSoftware(Enum):
"""
EMarket = 'EMarket'
+ def __str__(self):
+ return self.name
+
RATE_POSITIVE = 0, 10
RATE_NEGATIVE = -3, 5
@@ -55,6 +63,12 @@ class RatingRange(IntEnum):
else:
return cls.HIGH
+ def __str__(self):
+ return inflection.humanize(self.name)
+
+ def __format__(self, format_spec):
+ return str(self)
+
@unique
class PriceSoftware(Enum):
@@ -81,6 +95,9 @@ class AppearanceRange(Enum):
D = 'D. Is acceptable (visual damage in visible parts, not screens)'
E = 'E. Is unacceptable (considerable visual damage that can affect usage)'
+ def __str__(self):
+ return self.name
+
@unique
class FunctionalityRange(Enum):
@@ -91,6 +108,9 @@ class FunctionalityRange(Enum):
C = 'C. A non-important button (or similar) doesn\'t work; screen has multiple scratches in edges'
D = 'D. Multiple buttons don\'t work; screen has visual damage resulting in uncomfortable usage'
+ def __str__(self):
+ return self.name
+
@unique
class Bios(Enum):
@@ -101,6 +121,9 @@ class Bios(Enum):
D = 'D. Like B or C, but you had to unlock the BIOS (i.e. by removing the battery)'
E = 'E. The device could not be booted through the network.'
+ def __str__(self):
+ return self.name
+
@unique
class Orientation(Enum):
@@ -222,7 +245,7 @@ class ComputerChassis(Enum):
Virtual = 'Non-physical device'
def __format__(self, format_spec):
- return self.value.lower()
+ return inflection.humanize(inflection.underscore(self.value))
class ReceiverRole(Enum):
diff --git a/ereuse_devicehub/resources/event/models.py b/ereuse_devicehub/resources/event/models.py
index d8e53243..8610978a 100644
--- a/ereuse_devicehub/resources/event/models.py
+++ b/ereuse_devicehub/resources/event/models.py
@@ -5,6 +5,7 @@ from distutils.version import StrictVersion
from typing import Set, Union
from uuid import uuid4
+import inflection
from boltons import urlutils
from citext import CIText
from flask import current_app as app, g
@@ -196,6 +197,17 @@ class Event(Thing):
raise ValidationError('The event cannot start after it finished.')
return start_time
+ @property
+ def _err_str(self):
+ return '❌ Error.' if self.error else '✓'
+
+ @property
+ def _date_str(self):
+ return '{:%c}'.format(self.end_time or self.created)
+
+ def __str__(self) -> str:
+ return '{}'.format(self._err_str)
+
class EventComponent(db.Model):
device_id = Column(BigInteger, ForeignKey(Component.id), primary_key=True)
@@ -284,6 +296,11 @@ class EraseBasic(JoinedWithOneDeviceMixin, EventWithOneDevice):
only writing zeros.
"""
+ # todo return erasure properties like num steps, if it is british...
+
+ def __str__(self) -> str:
+ return '{} on {}.'.format(self._err_str, self.end_time)
+
class EraseSectors(EraseBasic):
pass
@@ -340,6 +357,9 @@ class Snapshot(JoinedWithOneDeviceMixin, EventWithOneDevice):
"""
expected_events = Column(ArrayOfEnum(DBEnum(SnapshotExpectedEvents)))
+ def __str__(self) -> str:
+ return '{}. {} version {}.'.format(self._err_str, self.software, self.version)
+
class Install(JoinedWithOneDeviceMixin, EventWithOneDevice):
elapsed = Column(Interval, nullable=False)
@@ -368,7 +388,8 @@ class Rate(JoinedWithOneDeviceMixin, EventWithOneDevice):
@property
def rating_range(self) -> RatingRange:
- return RatingRange.from_score(self.rating)
+ if self.rating:
+ return RatingRange.from_score(self.rating)
@declared_attr
def __mapper_args__(cls):
@@ -384,6 +405,9 @@ class Rate(JoinedWithOneDeviceMixin, EventWithOneDevice):
args[POLYMORPHIC_ON] = cls.type
return args
+ def __str__(self) -> str:
+ return '{} ({} v.{})'.format(self.rating_range, self.software, self.version)
+
class IndividualRate(Rate):
pass
@@ -400,6 +424,12 @@ class ManualRate(IndividualRate):
functionality_range = Column(DBEnum(FunctionalityRange))
functionality_range.comment = FunctionalityRange.__doc__
+ def __str__(self) -> str:
+ return super().__str__() + '. Appearance {} and functionality {}'.format(
+ self.appearance_range,
+ self.functionality_range
+ )
+
class WorkbenchRate(ManualRate):
id = Column(UUID(as_uuid=True), ForeignKey(ManualRate.id), primary_key=True)
@@ -425,6 +455,26 @@ class WorkbenchRate(ManualRate):
from ereuse_devicehub.resources.event.rate.main import main
return main(self, **app.config.get_namespace('WORKBENCH_RATE_'))
+ @property
+ def data_storage_range(self):
+ if self.data_storage:
+ return RatingRange.from_score(self.data_storage)
+
+ @property
+ def ram_range(self):
+ if self.ram:
+ return RatingRange.from_score(self.ram)
+
+ @property
+ def processor_range(self):
+ if self.processor:
+ return RatingRange.from_score(self.processor)
+
+ @property
+ def graphic_card_range(self):
+ if self.graphic_card:
+ return RatingRange.from_score(self.graphic_card)
+
class AggregateRate(Rate):
id = Column(UUID(as_uuid=True), ForeignKey(Rate.id), primary_key=True)
@@ -474,6 +524,22 @@ class AggregateRate(Rate):
def graphic_card(self):
return self.workbench.graphic_card
+ @property
+ def data_storage_range(self):
+ return self.workbench.data_storage_range
+
+ @property
+ def ram_range(self):
+ return self.workbench.ram_range
+
+ @property
+ def processor_range(self):
+ return self.workbench.processor_range
+
+ @property
+ def graphic_card_range(self):
+ return self.workbench.graphic_card_range
+
@property
def bios(self):
return self.workbench.bios
@@ -530,10 +596,11 @@ class Price(JoinedWithOneDeviceMixin, EventWithOneDevice):
uselist=False),
primaryjoin=AggregateRate.id == rating_id)
- def __init__(self, **kwargs) -> None:
+ def __init__(self, *args, **kwargs) -> None:
if 'price' in kwargs:
assert isinstance(kwargs['price'], Decimal), 'Price must be a Decimal'
- super().__init__(currency=kwargs.pop('currency', app.config['PRICE_CURRENCY']), **kwargs)
+ super().__init__(currency=kwargs.pop('currency', app.config['PRICE_CURRENCY']), *args,
+ **kwargs)
@classmethod
def to_price(cls, value: Union[Decimal, float], rounding=ROUND) -> Decimal:
@@ -543,6 +610,23 @@ class Price(JoinedWithOneDeviceMixin, EventWithOneDevice):
# equation from marshmallow.fields.Decimal
return value.quantize(Decimal((0, (1,), -cls.SCALE)), rounding=rounding)
+ @declared_attr
+ def __mapper_args__(cls):
+ """
+ Defines inheritance.
+
+ From `the guide
-
{% for c in components if c.t == type %}