From fda1b5cf1a4fe35ab8967e9f958ffcd219e5da1b Mon Sep 17 00:00:00 2001 From: tr4ck3ur Date: Mon, 16 Feb 2015 01:12:17 +0100 Subject: Added mail handling removed tests routes for production --- jm2l/models.py | 56 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'jm2l/models.py') diff --git a/jm2l/models.py b/jm2l/models.py index cd23451..2500af9 100644 --- a/jm2l/models.py +++ b/jm2l/models.py @@ -87,10 +87,10 @@ class JM2L_Year(Base): description = Column(UnicodeText) doss_presse = Column(UnicodeText) state = Column(Enum('Archived', 'Cancelled', 'Ongoing')) - start_time = Column(DateTime, default=datetime.datetime.utcnow) - end_time = Column(DateTime, default=datetime.datetime.utcnow) - created = Column(DateTime, default=datetime.datetime.utcnow) - last_change = Column(DateTime, default=datetime.datetime.utcnow) + start_time = Column(DateTime, default=datetime.datetime.now) + end_time = Column(DateTime, default=datetime.datetime.now) + created = Column(DateTime, default=datetime.datetime.now) + last_change = Column(DateTime, default=datetime.datetime.now) @property def AvailableTimeSlots(self, TimeStep=30): @@ -121,9 +121,9 @@ class User(Base): fonction = Column(Unicode(80)) website = Column(Unicode(100)) phone = Column(Unicode(10)) - created = Column(DateTime, default=datetime.datetime.utcnow) - last_logged = Column(DateTime, default=datetime.datetime.utcnow) - last_change = Column(DateTime, default=datetime.datetime.utcnow) + created = Column(DateTime, default=datetime.datetime.now) + last_logged = Column(DateTime, default=datetime.datetime.now) + last_change = Column(DateTime, default=datetime.datetime.now) active = Column(Integer, default=1) bio = Column(UnicodeText) gpg_key = Column(UnicodeText) @@ -231,8 +231,8 @@ class Tiers(Base): description = Column(UnicodeText) website = Column(Unicode(100)) tiers_type = Column(Integer, ForeignKey('tiers_opt.uid'), default=1) - created = Column(DateTime, default=datetime.datetime.utcnow) - last_change = Column(DateTime, default=datetime.datetime.utcnow) + created = Column(DateTime, default=datetime.datetime.now) + last_change = Column(DateTime, default=datetime.datetime.now) # relations ent_type = relationship('TiersOpt') #members = relationship('User', secondary='user_tiers_link' ) @@ -307,7 +307,7 @@ class Media(Base): height = Column(Integer) length = Column(Integer) filename = Column(UnicodeText) - created = Column(DateTime, default=datetime.datetime.utcnow) + created = Column(DateTime, default=datetime.datetime.now) @property def get_path(self): @@ -334,8 +334,8 @@ class Salles(Base): name = Column(Unicode(40)) place_type = Column(Enum('Conference', 'Stand', 'Ateliers', 'Autres')) description = Column(UnicodeText) # Description du matériel disponible - created = Column(DateTime, default=datetime.datetime.utcnow) - last_change = Column(DateTime, default=datetime.datetime.utcnow) + created = Column(DateTime, default=datetime.datetime.now) + last_change = Column(DateTime, default=datetime.datetime.now) @classmethod def by_id(cls, uid): @@ -358,8 +358,8 @@ class Place(Base): website = Column(Unicode(100)) description = Column(UnicodeText) created_by = Column(Integer, ForeignKey('users.user_id')) - created = Column(DateTime, default=datetime.datetime.utcnow) - last_change = Column(DateTime, default=datetime.datetime.utcnow) + created = Column(DateTime, default=datetime.datetime.now) + last_change = Column(DateTime, default=datetime.datetime.now) @classmethod def by_id(cls, uid): @@ -389,8 +389,8 @@ class Itineraire(Base): tr_avion = Column(Boolean, default=False) description = Column(UnicodeText) created_by = Column(Integer, ForeignKey('users.user_id')) # User link - created = Column(DateTime, default=datetime.datetime.utcnow) - last_change = Column(DateTime, default=datetime.datetime.utcnow) + created = Column(DateTime, default=datetime.datetime.now) + last_change = Column(DateTime, default=datetime.datetime.now) # relations start = relationship(Place, foreign_keys=[start_place]) arrival = relationship(Place, foreign_keys=[arrival_place]) @@ -413,8 +413,8 @@ class Exchange(Base): # Users asker_id = Column(Integer, ForeignKey('users.uid')) # User link provider_id = Column(Integer, ForeignKey('users.uid')) # User link - start_time = Column(DateTime, default=datetime.datetime.utcnow) - end_time = Column(DateTime, default=datetime.datetime.utcnow) + start_time = Column(DateTime, default=datetime.datetime.now) + end_time = Column(DateTime, default=datetime.datetime.now) # Co-voiturage itin_id = Column(Integer, ForeignKey('itineraire.itin_id')) # Itineraire link # Hebergement @@ -424,8 +424,8 @@ class Exchange(Base): description = Column(UnicodeText) pictures = Column(Unicode(80)) created_by = Column(Integer) # User link - created = Column(DateTime, default=datetime.datetime.utcnow) - last_change = Column(DateTime, default=datetime.datetime.utcnow) + created = Column(DateTime, default=datetime.datetime.now) + last_change = Column(DateTime, default=datetime.datetime.now) # relations Category = relationship(Exchange_Cat, backref="exchanges") Itin = relationship(Itineraire, backref="exchanged") @@ -517,8 +517,8 @@ class Sejour(Base): arrival_place = Column(Integer, ForeignKey('place.place_id')) # Place link depart_time = Column(DateTime) depart_place = Column(Integer, ForeignKey('place.place_id')) # Place link - created = Column(DateTime, default=datetime.datetime.utcnow) - last_change = Column(DateTime, default=datetime.datetime.utcnow) + created = Column(DateTime, default=datetime.datetime.now) + last_change = Column(DateTime, default=datetime.datetime.now) class Event(Base): __tablename__ = 'events' @@ -529,11 +529,11 @@ class Event(Base): name = Column(Unicode(100), nullable=False) slug = Column(Unicode(100)) event_type = Column(Enum('Stand', 'Table ronde', 'Atelier', 'Concert', 'Conference', 'Repas')) - start_time = Column(DateTime, default=datetime.datetime.utcnow) - end_time = Column(DateTime, default=datetime.datetime.utcnow) + start_time = Column(DateTime, default=datetime.datetime.now) + end_time = Column(DateTime, default=datetime.datetime.now) description = Column(UnicodeText) - created = Column(DateTime, default=datetime.datetime.utcnow) - last_change = Column(DateTime, default=datetime.datetime.utcnow) + created = Column(DateTime, default=datetime.datetime.now) + last_change = Column(DateTime, default=datetime.datetime.now) intervenants = relationship(User, secondary='user_event_link', backref=backref('participate', uselist=False), @@ -581,8 +581,8 @@ class Entry(Base): active = Column(Integer, default=True) title = Column(Unicode(255), unique=True, nullable=False) body = Column(UnicodeText, default=u'') - created = Column(DateTime, default=datetime.datetime.utcnow) - edited = Column(DateTime, default=datetime.datetime.utcnow) + created = Column(DateTime, default=datetime.datetime.now) + edited = Column(DateTime, default=datetime.datetime.now) @classmethod def all(cls): -- cgit v1.2.3-54-g00ecf