README.md

@@ -1,5 +1,4 @@
 ## Worflow
-install the dependencies by running `pip install -r requirements.txt`
 start the server by running
 `$python server.py`
 
@@ -7,18 +6,15 @@ start the server by running
 `$http --session=./session.json -f POST http://127.0.0.1:5000/api/login username=user@example.com password=password`
 
 ### Update Attendance
-#### Student :
+Student :
 `$http --session=./session.json -f POST http://127.0.0.1:5000/api/attendance/student presence=absent identifier=2 time=now`
-#### Class :
+Class :
-`$ http --session=./session.json -f POST http://127.0.0.1:5000/api/attendance/class presence=present identifier=1 time=now`
+`http --session=./session.json -f POST http://127.0.0.1:5000/api/attendance/class presence=present identifier=1 time=now`
 
 
 ### Get Attendance
-#### Student:
+Student:
-`$ http --session=./session.json GET "http://127.0.0.1:5000/api/attendance/student?identifier=2&start_time=now&end_time=now"`
+`http --session=./session.json GET "http://127.0.0.1:5000/api/attendance/student?identifier=2&start_time=now&end_time=now"`
-
+`http --session=./session.json GET "http://127.0.0.1:5000/api/attendance/student?identifier=3&start_time=now&end_time=now"`
-or
+Class:
-
+`http --session=./session.json GET "http://127.0.0.1:5000/api/attendance/class?identifier=1&start_time=now&end_time=now"`
-`$ http --session=./session.json GET "http://127.0.0.1:5000/api/attendance/student?identifier=3&start_time=now&end_time=now"`
-#### Class:
-`$ http --session=./session.json GET "http://127.0.0.1:5000/api/attendance/class?identifier=1"`

models.py

@@ -35,7 +35,6 @@ class Presence(Enum):
     """docstring for ResultType."""
     PRESENT, ABSENT, SICK, VACATION = range(4)
 
-presense_map = {i:str(i).replace('Presence.', '').upper() for i in Presence}
 
 class Gradeclass(db.Model):
     id = db.Column(db.Integer, primary_key=True)
@@ -50,7 +49,7 @@ class Student(db.Model):
     student_name = db.Column(db.String(255))
     gradeclass_id = db.Column(db.Integer, db.ForeignKey('gradeclass.id'))
     gradeclass = db.relationship(
-        'Gradeclass', backref=db.backref('students', lazy='dynamic'))
+        'Gradeclass', backref=db.backref('gradeclass', lazy='dynamic'))
 
     def __init__(self, student_name, gradeclass_id):
         self.student_name = student_name

requirements.txt

@@ -2,9 +2,7 @@ aniso8601==1.2.1
 Babel==2.5.0
 bcrypt==3.1.3
 blinker==1.4
-certifi==2017.7.27.1
 cffi==1.10.0
-chardet==3.0.4
 click==6.7
 Flask==0.12.2
 Flask-BabelEx==0.9.3
@@ -12,11 +10,10 @@ Flask-Login==0.4.0
 Flask-Mail==0.9.1
 Flask-Principal==0.4.0
 Flask-Restless==0.17.0
+flask-restplus==0.10.1
 Flask-Security==3.0.0
 Flask-SQLAlchemy==2.2
 Flask-WTF==0.14.2
-httpie==0.9.9
-idna==2.6
 itsdangerous==0.24
 Jinja2==2.9.6
 jsonschema==2.6.0
@@ -24,14 +21,11 @@ MarkupSafe==1.0
 mimerender==0.6.0
 passlib==1.7.1
 pycparser==2.18
-Pygments==2.2.0
 python-dateutil==2.6.1
 python-mimeparse==1.6.0
 pytz==2017.2
-requests==2.18.4
 six==1.10.0
 speaklater==1.3
 SQLAlchemy==1.1.13
-urllib3==1.22
 Werkzeug==0.12.2
 WTForms==2.1

server.py

@@ -1,11 +1,10 @@
 from flask import Flask, Blueprint, request
 from flask_security import (SQLAlchemyUserDatastore, login_required,
                             current_user, Security)
-from flask_security.utils import (verify_and_update_password, login_user,
+from flask_security.utils import verify_and_update_password, login_user
-                                  logout_user)
 from flask_restless import APIManager, ProcessingException
 from models import (db, User, Role, Gradeclass, Student, AttendanceUpdate,
-                    Presence, presense_map)
+                    Presence)
 from sqlalchemy import func
 import json
 from datetime import datetime, date
@@ -14,11 +13,11 @@ from dateutil import parser
 app = Flask(__name__)
 app.config['DEBUG'] = True
 app.config['PORT'] = 5001
-app.config['SECRET_KEY'] = '3kljk1232kl1j32kmk13nbciw'
+app.config['SECRET_KEY'] = 'super-secret'
 app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:////tmp/db.sqlite'
 app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
+app.config['DEFAULT_MAIL_SENDER'] = 'info@example.com'
 app.config['SECURITY_PASSWORD_SALT'] = 'uaisfyasiduyaisiuf'
-app.config['SECURITY_UNAUTHORIZED_VIEW'] = None
 
 db.init_app(app)
 user_datastore = SQLAlchemyUserDatastore(db, User, Role)
@@ -45,10 +44,10 @@ manager.create_api(
     results_per_page=5,
     preprocessors=verify_logged_id)
 
+
 json_cont = {'Content-Type': 'application/json'}
 resp = lambda val,code: (json.dumps({'status': val}), code, json_cont)
-resp_res = lambda val, code: (json.dumps({'results': val}), code, json_cont)
+presense_map = {i:str(i).replace('Presence.', '').upper() for i in Presence}
-
 
 @app.before_first_request
 def create_test_data():
@@ -60,8 +59,7 @@ def create_test_data():
             db.session.add(g_cls)
             db.session.commit()
             for s in range(5):
-                stu = Student("TestStudent#{}-Class{}".format(s + 1, g_cls.id),
+                stu = Student("TestStudent#{}-Class{}".format(s,g_cls.id), g_cls.id)
-                              g_cls.id)
                 db.session.add(stu)
         user_datastore.create_user(
             email='user@example.com', password='password')
@@ -74,54 +72,32 @@ def parse_time(time_str):
     utc_now = (time_str and time_str == 'now') or not time_str
     time = datetime.utcnow() if utc_now else None
     try:
-        time = parser.parse(time_str)
+        time = parser.parse(attend_date)
     except:
         pass
     return time
 
 
 def compute_attendance(request_type,object_id, start_time, end_time):
-    print('AttendanceUpdates for :', start_time, end_time)
+    def get_record(req_type,obj_id):
-
+        attend = AttendanceUpdate.query.filter(
-    def get_records(req_type, obj_id):
+            AttendanceUpdate.update_type == req_type
-        return AttendanceUpdate.query.filter(
+        ).filter(
-            AttendanceUpdate.update_type == req_type).filter(
+            AttendanceUpdate.value_identifier == obj_id
-                AttendanceUpdate.value_identifier == obj_id).filter(
+        ).filter(
-                    func.date(AttendanceUpdate.time) >=
+            func.date(AttendanceUpdate.time) >= start_time.date()
-                    start_time.date()).filter(
+        ).filter(
-                        func.date(AttendanceUpdate.time) <=
+            func.date(AttendanceUpdate.time) >= end_time.date()
-                        end_time.date()).all()
+        ).first()
-
+        return attend
-    def student_records(stud_id):
+    pres_rec = None
-        stud_recs = get_records('student', stud_id)
-        stud = Student.query.get(stud_id)
-        gcls_recs = get_records('class', stud.gradeclass_id)
-        pres_rec = stud_recs
-        for gr in gcls_recs:
-            # if any grade record overlaps with student record -> ignore
-            if not any(
-                    map(lambda x: gr.time.date() == x.time.date(), stud_recs)):
-                pres_rec.append(gr)
-        recs = []
-        # sort student records by time
-        for r in sorted(pres_rec, key=lambda x: x.time):
-            recs.append({
-                "presence": presense_map[r.presence].lower(),
-                "student": stud.student_name,
-                "time": r.time.isoformat()
-            })
-        return recs
-
-    result = []
     if request_type == 'student':
-        result.extend(student_records(object_id))
+        stud_rec = get_record('student',object_id)
+        stud = Student.query.get(object_id)
+        pres_rec = stud_rec if stud_rec else get_record('class',stud.gradeclass_id)
     if request_type == 'class':
-        gcls = Gradeclass.query.get(object_id)
+        pres_rec = get_record(request_type,object_id)
-        # get result for each student
+    return presense_map[pres_rec.presence].lower() if pres_rec else 'no_records'
-        for stud in gcls.students:
-            result.extend(student_records(stud.id))
-    return result
-
 
 def upsert_attendance(update_type, object_id, attend_time, pres_enum):
     existing = AttendanceUpdate.query.filter(
@@ -139,6 +115,7 @@ def upsert_attendance(update_type, object_id, attend_time, pres_enum):
 
 
 def validate_attend(update_type, object_id):
+    # return True
     if update_type in ['class', 'student'] and object_id:
         g_cls_found = update_type == 'class' and Gradeclass.query.get(
             object_id)
@@ -156,7 +133,7 @@ def get_attendance(update_type, request):
     ret_data = resp('invalid',400)
     if validate_attend(update_type, object_id) and start_time and end_time:
         pres = compute_attendance(update_type,object_id,start_time,end_time)
-        ret_data = resp_res(pres, 200)
+        ret_data = resp(pres,200)
     return ret_data
 
 
@@ -167,9 +144,8 @@ def update_attendance(update_type, request):
     attend_time = parse_time(attend_str)
     ret_data = resp('invalid',400)
     if validate_attend(
-            update_type,
+            update_type, object_id
-            object_id) and presence and attend_time and presence.upper(
+    ) and presence and attend_time and presence.upper() in presense_map.values():
-            ) in presense_map.values():
         pres_enum = Presence[presence.upper()]
         upsert_attendance(update_type, object_id, attend_time, pres_enum)
         ret_data = resp('updated',200)
@@ -200,12 +176,6 @@ def login():
     return ret_data
 
 
-@app.route('/api/logout', methods=['GET'])
-def logout():
-    logout_user()
-    return resp('success', 200)
-
-
 @app.route('/')
 def home():
     return 'hello'