upd: xlsx coordinated format

v0.2
rrr-marble 4 years ago
parent 2bd1970c59
commit 4a400087d4

@ -18,8 +18,10 @@ class ItemBase(Base):
__tablename__ = "geodata" __tablename__ = "geodata"
id = Column(Integer, primary_key=True, index=True) id = Column(Integer, primary_key=True, index=True)
fadr = Column(String) internal_id = Column(String)
oldid = Column(String) x_coord = Column(String)
y_coord = Column(String)
gis_category = Column(String)
category = Column(String) category = Column(String)
basin = Column(String) basin = Column(String)
deposit = Column(String) deposit = Column(String)
@ -31,14 +33,13 @@ class ItemBase(Base):
ownercontacts = Column(String) ownercontacts = Column(String)
samplelist = Column(String) samplelist = Column(String)
description = Column(String) description = Column(String)
formdimentions = Column(String) form_dimentions = Column(String)
datalist = Column(String) datalist = Column(String)
resolution = Column(String) resolution = Column(String)
date = Column(String) date = Column(String)
additionalinfo = Column(String) additional_info = Column(String)
scanner = Column(String) scanner = Column(String)
comment = Column(String) comment = Column(String)
continuation = Column(String)
class ItemCreate(ItemBase): class ItemCreate(ItemBase):

@ -26,8 +26,10 @@ class ItemBase(BaseModel):
по результатам экспедиционных исследований по результатам экспедиционных исследований
""" """
fadr: Optional[str] = None internal_id: Optional[str] = None
oldid: Optional[str] = None x_coord: Optional[str] = None
y_coord: Optional[str] = None
gis_category: Optional[str] = None
category: Optional[str] = None category: Optional[str] = None
basin: Optional[str] = None basin: Optional[str] = None
deposit: Optional[str] = None deposit: Optional[str] = None
@ -39,14 +41,13 @@ class ItemBase(BaseModel):
ownercontacts: Optional[str] = None ownercontacts: Optional[str] = None
samplelist: Optional[str] = None samplelist: Optional[str] = None
description: Optional[str] = None description: Optional[str] = None
formdimentions: Optional[str] = None form_dimentions: Optional[str] = None
datalist: Optional[str] = None datalist: Optional[str] = None
resolution: Optional[str] = None resolution: Optional[str] = None
date: Optional[Union[datetime, str]] = None date: Optional[Union[datetime, str]] = None
additionalinfo: Optional[str] = None additional_info: Optional[str] = None
scanner: Optional[str] = None scanner: Optional[str] = None
comment: Optional[str] = None comment: Optional[str] = None
continuation: Optional[str] = None
class ItemCreate(ItemBase): class ItemCreate(ItemBase):

Loading…
Cancel
Save