Removed third parties to use CloudFlare CDN.

Added scheduling (missing database update)
Using Jinja2 templates.
Updated layout.

src/api/controller/entries.py

@@ -18,11 +18,13 @@ from app import app
 from app import db
 
 from api.model.entries import Entry
+from api.model.operations import Operation
+from api.model.scheduled_operations import ScheduledOperation
 
 from sqlalchemy import func, desc
 from sqlalchemy.ext.hybrid import hybrid_property, hybrid_method
-from sqlalchemy.orm import sessionmaker, column_property
-from sqlalchemy.sql import func, select
+from sqlalchemy.orm import sessionmaker, column_property, aliased
+from sqlalchemy.sql import func, select, case
 
 #from sqlalchemy import *
 
@@ -35,17 +37,18 @@ def get_entries(account_id, year, month):
     """
     session = db.session
 
-    query = session.query(
-      Entry
-    ).select_from(
-      session.query(Entry)
-      .filter(Entry.account_id == account_id)
-      .order_by(
-        desc(Entry.operation_date),
-        Entry.value,
-        Entry.label,
-      ).subquery()
-    ).filter(func.date_trunc('month', Entry.operation_date) == "%s-%s-01" % (year, month))
+    base_query = session.query(
+        Operation,
+        case(whens={Operation.canceled: None}, else_=func.sum(Operation.value).over(partition_by="canceled", order_by="operation_date, value desc, label desc")).label("sold")
+    ).filter(Operation.account_id == account_id).order_by(
+        desc(Operation.operation_date),
+        Operation.value,
+        Operation.label,
+    ).subquery()
+
+    query = session.query(base_query).select_from(base_query).filter(func.date_trunc('month', base_query.c.operation_date) == "%s-%s-01" % (year, month))
+
+    print query
 
     return json.dumps([{
          "id": i.id,
@@ -54,8 +57,10 @@ def get_entries(account_id, year, month):
          "label": i.label,
          "value": str(i.value),
          "category": i.category,
-         "sold": str(i.sold),
-         "account_id": i.account_id
+         "sold": str(i.sold) if not i.canceled else None,
+         "account_id": i.account_id,
+         "canceled": i.canceled,
+         "scheduled_operation_id": i.scheduled_operation_id
     } for i in query.all()])
 
 @app.route("/api/entries", methods=["PUT"])
@@ -69,7 +74,8 @@ def add_entry():
           label = request.json['label'],
           value = request.json['value'],
           category = request.json['category'],
-          account_id = request.json['account_id']
+          account_id = request.json['account_id'],
+          scheduled_operation_id = request.json['scheduled_operation_id']
         )
     
         session.add(entry)
@@ -94,6 +100,7 @@ def update_entry(entry_id):
         entry.value = request.json['value']
         entry.category = request.json['category']
         entry.account_id = request.json['account_id']
+        entry.scheduled_operation_id = request.json['scheduled_operation_id']
     
         session.merge(entry)
         session.commit()

src/api/controller/scheduled_operations.py

@@ -0,0 +1,107 @@
+from app import app
+from app import db
+
+from api.model.scheduled_operations import ScheduledOperation
+
+from sqlalchemy import func, desc
+from sqlalchemy.ext.hybrid import hybrid_property, hybrid_method
+from sqlalchemy.orm import sessionmaker, column_property
+from sqlalchemy.sql import func, select
+
+from flask import json, request
+
+@app.route("/api/scheduled_operations/<account_id>")
+def get_scheduled_operations(account_id):
+    """
+    Return entries for an account, year, and month.
+    """
+    session = db.session
+
+    query = session.query(
+      ScheduledOperation
+    ).select_from(
+      session.query(ScheduledOperation)
+      .filter(ScheduledOperation.account_id == account_id)
+      .order_by(
+        desc(ScheduledOperation.day),
+        ScheduledOperation.value,
+        ScheduledOperation.label,
+      ).subquery()
+    )
+
+    return json.dumps([{
+         "id": i.id,
+         "start_date": i.start_date.strftime("%Y-%m-%d"),
+         "stop_date": i.stop_date.strftime("%Y-%m-%d"),
+         "day": str(i.day),
+         "frequency": str(i.frequency),
+         "label": i.label,
+         "value": str(i.value),
+         "category": i.category,
+         "account_id": i.account_id
+    } for i in query.all()])
+
+@app.route("/api/scheduled_operations", methods=["PUT"])
+def add_scheduled_operation():
+    session = db.session
+
+    try:
+        scheduledOperation = ScheduledOperation(
+          start_date = request.json['start_date'],
+          stop_date = request.json['stop_date'],
+          day = request.json['day'],
+          frequency = request.json['frequency'],
+          label = request.json['label'],
+          value = request.json['value'],
+          category = request.json['category'],
+          account_id = request.json['account_id']
+        )
+    
+        session.add(scheduledOperation)
+        session.commit()
+    
+        return json.dumps("Scheduled operation added.")
+    except:
+        session.rollback()
+        raise
+
+@app.route("/api/scheduled_operations/<scheduled_operation_id>", methods=["PUT"])
+def update_scheduled_operation(scheduled_operation_id):
+    session = db.session
+
+    try:
+        scheduledOperation = session.query(ScheduledOperation).filter(ScheduledOperation.id == scheduled_operation_id).first()
+    
+        scheduledOperation.id = scheduled_operation_id
+        scheduledOperation.start_date = request.json['start_date'],
+        scheduledOperation.stop_date = request.json['stop_date'],
+        scheduledOperation.day = request.json['day'],
+        scheduledOperation.frequency = request.json['frequency'],
+        scheduledOperation.label = request.json['label']
+        scheduledOperation.value = request.json['value']
+        scheduledOperation.category = request.json['category']
+        scheduledOperation.account_id = request.json['account_id']
+    
+        session.merge(scheduledOperation)
+        session.commit()
+    
+        return json.dumps("Scheduled operation #%s updated." % scheduled_operation_id)
+    except:
+        session.rollback()
+        raise
+
+@app.route("/api/scheduled_operations/<scheduled_operation_id>", methods=["DELETE"])
+def delete_scheduled_operation(scheduled_operation_id):
+    session = db.session
+
+    try:
+        scheduledOperation = session.query(ScheduledOperation).filter(ScheduledOperation.id == scheduled_operation_id).first()
+    
+        session.delete(scheduledOperation)
+        session.commit()
+    
+        return json.dumps("Scheduled operation #%s deleted." % scheduled_operation_id)
+    except:
+        session.rollback()
+        raise
+

src/api/model/entries.py

@@ -18,6 +18,7 @@ from app import app
 from app import db
 
 from api.model.accounts import Account
+from api.model.scheduled_operations import ScheduledOperation
 
 from sqlalchemy import func, desc
 from sqlalchemy.orm import column_property
@@ -30,17 +31,19 @@ class Entry(db.Model):
     label = db.Column(db.String(500), nullable = False)
     value = db.Column(db.Numeric(15, 2), nullable = False)
     account_id = db.Column(db.Integer, db.ForeignKey('account.id'))
+    scheduled_operation_id = db.Column(db.Integer, db.ForeignKey('scheduled_operation.id'))
 
     account = db.relationship(Account, backref = db.backref('entry', lazy="Dynamic"))
+    scheduled_operation = db.relationship(ScheduledOperation, backref = db.backref('entry', lazy="Dynamic"))
 
     category = db.Column(db.String(100), nullable = True)
-    sold = column_property(func.sum(value).over(order_by="operation_date, value desc, label desc"))
 
-    def __init__(self, pointed, label, value, account_id, operation_date = None, category = None):
+    def __init__(self, pointed, label, value, account_id, operation_date = None, category = None, scheduled_operation_id = None):
         self.pointed = pointed
         self.operation_date = operation_date
         self.label = label
         self.value = value
         self.account_id = account_id
         self.category = category
+        self.scheduled_operation_id = scheduled_operation_id
 

src/api/model/operations.py

@@ -0,0 +1,49 @@
+"""
+    This file is part of Accountant.
+
+    Accountant is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Foobar is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with Accountant.  If not, see <http://www.gnu.org/licenses/>.
+"""
+from app import app
+from app import db
+
+from api.model.accounts import Account
+from api.model.scheduled_operations import ScheduledOperation
+
+from sqlalchemy import func, desc
+from sqlalchemy.orm import column_property
+from sqlalchemy.sql import func, select
+
+class Operation(db.Model):
+    id = db.Column(db.Integer, primary_key=True)
+    pointed = db.Column(db.Boolean, nullable = False, default = False)
+    operation_date = db.Column(db.Date, nullable = False)
+    label = db.Column(db.String(500), nullable = False)
+    value = db.Column(db.Numeric(15, 2), nullable = False)
+    account_id = db.Column(db.Integer, db.ForeignKey('account.id'))
+    scheduled_operation_id = db.Column(db.Integer, db.ForeignKey('scheduled_operation.id'))
+
+    account = db.relationship(Account, backref = db.backref('operation', lazy="Dynamic"))
+
+    category = db.Column(db.String(100), nullable = True)
+
+    canceled = db.Column(db.Boolean, nullable = False)
+
+    def __init__(self, pointed, label, value, account_id, operation_date = None, category = None):
+        self.pointed = pointed
+        self.operation_date = operation_date
+        self.label = label
+        self.value = value
+        self.account_id = account_id
+        self.category = category
+

src/api/model/scheduled_operations.py

@@ -0,0 +1,33 @@
+from app import app
+from app import db
+
+from api.model.accounts import Account
+
+from sqlalchemy import func, desc
+from sqlalchemy.orm import column_property
+from sqlalchemy.sql import func, select
+
+class ScheduledOperation(db.Model):
+    id = db.Column(db.Integer, primary_key=True)
+    start_date = db.Column(db.Date, nullable = False)
+    stop_date = db.Column(db.Date, nullable = False)
+    day = db.Column(db.Integer, nullable = False)
+    frequency = db.Column(db.Integer, nullable = False)
+    label = db.Column(db.String(500), nullable = False)
+    value = db.Column(db.Numeric(15, 2), nullable = False)
+    account_id = db.Column(db.Integer, db.ForeignKey('account.id'))
+
+    account = db.relationship(Account, backref = db.backref('scheduled_operation', lazy="Dynamic"))
+
+    category = db.Column(db.String(100), nullable = True)
+
+    def __init__(self, start_date, stop_date, day, frequency, label, value, account_id, category = None):
+        self.start_date = start_date
+        self.stop_date = stop_date
+        self.day = day
+        self.frequency = frequency
+        self.label = label
+        self.value = value
+        self.account_id = account_id
+        self.category = category
+