diff --git a/.DS_Store b/.DS_Store index 7877a07..23147fa 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/app/__init__.py b/app/__init__.py index a1cb2a7..981b170 100755 --- a/app/__init__.py +++ b/app/__init__.py @@ -16,7 +16,7 @@ app = Flask(__name__) app.config['SECRET_KEY'] = 'super secret key' #app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:////tmp/mydatabase.db' app.config['UPLOAD_FOLDER'] = UPLOAD_FOLDER -app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///' + os.path.join(basedir, 'mydatabase.db') +app.config['SQLALCHEMY_DATABASE_URI'] = 'rqlite+pyrqlite://localhost:4001/' db = SQLAlchemy(app) app.config.from_object(__name__) diff --git a/app/models.py b/app/models.py index b103540..64061c9 100755 --- a/app/models.py +++ b/app/models.py @@ -23,6 +23,8 @@ class Book(db.Model): backref=db.backref('books', lazy=True)) tags = db.relationship('Tag', secondary=tags, lazy='subquery', backref=db.backref('books', lazy=True)) + scapeX = db.Column(db.Numeric(10,2)) + scapeY = db.Column(db.Numeric(10,2)) def __init__(self, title, file, cover, fileformat, category): self.title = title @@ -30,6 +32,8 @@ class Book(db.Model): self.cover = cover self.fileformat = fileformat self.category = category + self.scapeX = 0 + self.scapeY = 0 def __repr__(self): diff --git a/app/templates/base.html b/app/templates/base.html index fc7e9b7..91396d2 100755 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -38,14 +38,48 @@ diff --git a/app/templates/edit_book_detail.html b/app/templates/edit_book_detail.html index 0125983..f7f9a27 100755 --- a/app/templates/edit_book_detail.html +++ b/app/templates/edit_book_detail.html @@ -11,7 +11,9 @@ {{ form.csrf_token }}

{{ form.title.label }} {{ form.title(size=20, class="form-control") }}

+ +

{{ form.author.label }}