https and ssl integration on the backend, frontend and started integration of logistics app as a separate frontend
This commit is contained in:
@ -73,13 +73,13 @@ class Dewar(Base):
|
||||
shipping_date = Column(Date, nullable=True)
|
||||
arrival_date = Column(Date, nullable=True)
|
||||
returning_date = Column(Date, nullable=True)
|
||||
unique_id = Column(String(36), default=lambda: str(uuid.uuid4()), unique=True, index=True, nullable=True)
|
||||
qrcode = Column(String, nullable=True)
|
||||
unique_id = Column(String, unique=True, index=True, nullable=True)
|
||||
shipment_id = Column(Integer, ForeignKey("shipments.id"))
|
||||
return_address_id = Column(Integer, ForeignKey("addresses.id"))
|
||||
contact_person_id = Column(Integer, ForeignKey("contact_persons.id"))
|
||||
|
||||
shipment = relationship("Shipment", back_populates="dewars")
|
||||
events = relationship("LogisticsEvent", back_populates="dewar")
|
||||
return_address = relationship("Address")
|
||||
contact_person = relationship("ContactPerson")
|
||||
pucks = relationship("Puck", back_populates="dewar")
|
||||
@ -132,22 +132,30 @@ class Sample(Base):
|
||||
puck_id = Column(Integer, ForeignKey('pucks.id'))
|
||||
puck = relationship("Puck", back_populates="samples")
|
||||
|
||||
|
||||
class Slot(Base):
|
||||
__tablename__ = "slots"
|
||||
|
||||
id = Column(String, primary_key=True, index=True)
|
||||
qr_code = Column(String, unique=True, index=True)
|
||||
label = Column(String)
|
||||
qr_base = Column(String, nullable=True)
|
||||
occupied = Column(Boolean, default=False)
|
||||
needs_refill = Column(Boolean, default=False)
|
||||
time_until_refill = Column(Interval, nullable=True)
|
||||
last_refill = Column(DateTime, default=datetime.utcnow)
|
||||
time_until_refill = Column(Integer) # store as total seconds
|
||||
|
||||
@property
|
||||
def calculate_time_until_refill(self):
|
||||
if self.last_refill and self.time_until_refill:
|
||||
return self.last_refill + self.time_until_refill - datetime.utcnow()
|
||||
return None
|
||||
|
||||
class LogisticsEvent(Base):
|
||||
__tablename__ = "logistics_events"
|
||||
__tablename__ = 'logistics_events'
|
||||
id = Column(Integer, primary_key=True, index=True, autoincrement=True)
|
||||
dewar_id = Column(Integer, ForeignKey('dewars.id'), nullable=False)
|
||||
slot_id = Column(String, ForeignKey('slots.id'), nullable=True)
|
||||
event_type = Column(String, nullable=False)
|
||||
timestamp = Column(DateTime, default=datetime.utcnow)
|
||||
|
||||
dewar = relationship("Dewar")
|
||||
slot = relationship("Slot")
|
||||
dewar = relationship("Dewar", back_populates="events")
|
Reference in New Issue
Block a user