Course materials

app/__init__.py

@@ -1,13 +1,17 @@
 '''
 This file is called by "from app import app" inside the app.py file. 
 
-It includes all the imports to be used in the app (from allImports import *).
+It includes all the imports to be used in the app (from app.allImports import *).
 It also includes all the application files that are used as "pages" in the app
 (e.g., "from app import start" imports all the code in start.py that is behind the start.html webpage)
 '''
 
-from allImports import *
-from app import allImports
+from flask import Flask
+
+
+
+app = Flask(__name__)
+from app.allImports import *
 
 # Include an import for every python file that is serving a webpage
 #import your new python files here. It is not a part of the module until it is imported

app/addCourse.py

@@ -1,7 +1,9 @@
-from allImports import *
+from app.allImports import *
 from app.logic import databaseInterface 
 from app.logic.getAuthUser import AuthorizedUser
 from app.logic.redirectBack import redirect_url
+from app.models import Semesters, Programs, Users
+
 
 #Add Course
 @app.route('/admin/courseManagement/addCourse',methods=["GET","POST"])

app/allImports.py

@@ -12,12 +12,15 @@
 from flask import flash
 from flask import abort
 from flask_admin import Admin
-
+import sys
 import pprint
+
 from app import models
-from models import *                # all the database models
+# from models import *                # all the database models
+from app.loadConfig import *
+here = os.path.dirname(__file__)
+cfg       = load_config(os.path.join(here,'config.yaml'))
 
-import sys
 sys.dont_write_bytecode = True
 
 def authUser(env):
@@ -41,7 +44,7 @@ def authUser(env):
 @param {string} filename - the name of the file that should be in that directory
 @return {string} filepath -returns the absolute path of the directory'''
 '''TODO: ADD @PARAm for make dirs'''
-def getAbsolutePath(relaitivePath,filename=None,makeDirs=False):
+def getAbsolutePath(relaitivePath, filename=None, makeDirs=False):
     filepath = os.path.join(sys.path[0],relaitivePath)
     if makeDirs == True:
         try:
@@ -59,8 +62,8 @@ def getAbsolutePath(relaitivePath,filename=None,makeDirs=False):
 "A decorator is just a callable that takes a function as an argument and
 returns a replacement function. See start.py for an example"
 '''
-app = Flask(__name__)
-#from app import app
+# app = Flask(__name__)
+from app import app
 app.config.from_object('settings')
 
 # admin = Admin(app)

app/archive.py

@@ -1,7 +1,8 @@
-from allImports import *
+from app.allImports import *
 from app.logic import databaseInterface
 from app.logic.getAuthUser import AuthorizedUser
 from app.logic.getAll import GetAll
+from app.models import Semesters
 
 @app.route("/archive/", defaults={'SEID': None}, methods = ["GET", "POST"])
 @app.route("/archive/<SEID>", methods = ["GET", "POST"])

app/config.yaml

@@ -53,7 +53,7 @@ courseManagementSidebar:
     link: "/admin/courseManagement/removeCourse"
 
 Headers:
-  Courses: ['Instructor','Course','Term','Syllabus Upload','Last Modified By']
+  Courses: ['Instructor','Course','Term','Syllabus Upload','Course Materials','Last Modified By']
   Archive: ['Instructor','Course','Term','Syllabus Upload','Last Modified By']
 
 fileOperations:
@@ -81,9 +81,9 @@ termInfo:
     #10: 'Berea Bridge Program'   # e.g. Berea Bridge Program 2016 = 201610 
 
 DEBUG:
-  #user: "[email protected]" #Admin Access
+  user: "[email protected]" #Admin Access
   # user: "pearcej" #Division Chair Access
-   user: "jadudm"  #Professor Access
+  # user: "jadudm"  #Professor Access
   # user: "nakazawam" #Program Access
 
 contributors:

app/contributors.py

@@ -1,4 +1,4 @@
-from allImports import *
+from app.allImports import *
 from app.logic import databaseInterface
 from app.logic.getAuthUser import AuthorizedUser
 from app.logic.getAll import GetAll

app/courses.py

@@ -1,10 +1,11 @@
-from allImports import *
+from app.allImports import *
 #IMPORT LOGIC FILES
 from app.logic import databaseInterface
 from app.logic.getAuthUser import AuthorizedUser 
 from app.logic.getCourses import GetCourses
 from app.logic.switch import switch
 from app.logic.getAll import GetAll
+from app.models import Semesters
 
 @app.route("/courses", methods = ["GET"]) #SET A DEFAULT APP ROUTE
 @app.route("/courses/<term>", methods = ["GET"]) #SET A DEFAULT APP ROUTE
@@ -34,6 +35,10 @@ def courses(term = 0):
   programs_to_courses   = two_dictionaries[1]
   # MY COURSES SELECT QUERY
   my_courses                  = getCourses.check_for_my_courses(currentSEID)
+  if my_courses and my_courses.courseMaterials:
+      print(my_courses.courseMaterials)
+      my_courses.courseMaterials = list(my_courses.courseMaterials)
+      print(my_courses.courseMaterials)
   # RENDER CORRECT PAGE BASED ON ACCESS LEVEL
   for case in switch(user_level):
     if case('admin'):
@@ -48,7 +53,7 @@ def courses(term = 0):
       break;
     if case('division'):
       division_key            = user.DID
-      print division_key
+      print(division_key)
       return render_template('courses/division.html',
                               cfg                   = cfg,
                               my_courses            = my_courses,
@@ -81,3 +86,19 @@ def courses(term = 0):
       abort(404)
       render_template('error.html')
 
+@app.route("/editCourseMaterials/<courseID>", methods = ["POST"])
+def editCourseMaterials(courseID):
+    data = request.form.to_dict(flat=False)
+    print(courseID)
+    # courseMaterials = []
+    # if len(data) >= 0:
+    #     for courseMaterialUsed in data:
+    #         if courseMaterialUsed == "NoneRequired":
+    #             break
+    #         courseMaterials.append(courseMaterialUsed)
+    course = databaseInterface.get_course_info(courseID)
+    # print(str(courseMaterials))
+    course.courseMaterials = data
+    course.save()
+    print(course.courseMaterials)
+    return "", 200

app/databaseAdmin.py

@@ -1,4 +1,4 @@
-from allImports import *
+from app.allImports import *
 from flask_admin.contrib.peewee import ModelView
 
 class AuthenticatedUser(ModelView):

app/deadlineDisplay.py

@@ -1,7 +1,9 @@
-from allImports import *
+# from app import app
+from app.allImports import *
 from app.logic.getAuthUser import AuthorizedUser
 import datetime
 import time
+from app.models import Deadline
 #from datetime import datetime
 
 

app/deadlineManagement.py

@@ -1,7 +1,8 @@
-from allImports import *
+from app.allImports import *
 from app.logic.getAuthUser import AuthorizedUser
 from app.logic.redirectBack import redirect_url
 import datetime
+from app.models import Deadline
 
 
 @app.route("/deadline/create", methods=["POST"])
@@ -15,7 +16,7 @@ def deadlineCreate():
         # data contains 
         # deadlineDescription
         data = request.form
-	date = datetime.datetime.strptime(data['deadlineDate'],"%m/%d/%Y").date()
+        date = datetime.datetime.strptime(data['deadlineDate'],"%m/%d/%Y").date()
         deadline = Deadline.create(
             description=data['deadlineDescription'],
             date=date)

app/deleteSyllabus.py

@@ -1,4 +1,4 @@
-from allImports import *
+from app.allImports import *
 import datetime
 #IMPORT LOGIC FILES
 from app.logic.getAuthUser import AuthorizedUser 
@@ -32,7 +32,7 @@ def delete(CID):
     update_last_modified.execute()
     return redirect(redirect_url())
 
-  except Exception,e:
+  except Exception as e:
     app.logger.info("{0} attempting to delete a syllabus.".format(str(e)))
     message = "An error occured during the delete process of the file."
     return render_template("error.html",

app/divisionManagement.py

@@ -1,6 +1,6 @@
-from allImports import *
+from app.allImports import *
 from app.logic.getAuthUser import AuthorizedUser
-
+from app.models import Divisions, Users
 
 @app.route("/admin/divisionManagement/<did>", methods=["GET", "POST"])
 def adminDivisionManagement(did):

app/download.py

@@ -4,7 +4,7 @@
 import sys
 import zipfile
 #from Flask
-from allImports import *
+from app.allImports import *
 from flask import send_file
 from flask import send_from_directory
 # From Logic 
@@ -19,11 +19,11 @@ def download(CID):
   page = r"/" + request.url.split("/")[-1]
   try:
     file_path = databaseInterface.get_course_download_file_path(CID)
-    print "This is file_path: {}".format(file_path)
+    print("This is file_path: {}".format(file_path))
     message = "Download: {} has been downloaded".format(file_path)
     log.writer("INFO", page, message)
     return send_file(file_path, as_attachment=True)
-  except Exception,e:
+  except Exception as e:
     app.logger.info("{0} attempting to download file.".format(str(e)))
     message = "An error occured during the download process."
     return render_template("error.html",
@@ -61,7 +61,7 @@ def downloadAll(SEID):
       message = 'Download: {0} has been downloaded as a zip'.format(parent_folder)
       log.writer("INFO", page, message)
       return send_file(zip_path,as_attachment=True)
-    except Exception,e:
+    except Exception as e:
       return render_template('error.html',
                               cfg = cfg,
                               message = e

app/editAdmin.py

@@ -1,6 +1,7 @@
-from allImports import *
+from app.allImports import *
 from app.logic.getAuthUser import AuthorizedUser
 from app.logic.redirectBack import redirect_url
+from app.models import Users
 
 def checkData(data,key):
   user    = None

app/editDivision.py

@@ -1,6 +1,9 @@
-from allImports import *
+from app.allImports import *
 from app.logic.getAuthUser import AuthorizedUser
 from app.logic.redirectBack import redirect_url
+from app.models import Users
+
+
 @app.route("/editDivision", methods=["POST"])
 def editDivision():
     authorizedUser = AuthorizedUser()

app/editProgram.py

@@ -1,6 +1,8 @@
-from allImports import *
+from app.allImports import *
 from app.logic.getAuthUser import AuthorizedUser
 from app.logic.redirectBack import redirect_url
+from app.models import Users
+
 @app.route("/editProgram", methods=["POST"])
 def editProgram():
     authorizedUser = AuthorizedUser()
@@ -27,9 +29,8 @@ def editProgram():
       #LOOK THROUGH THE NEW CHAIR LIST    
       for user_name in newChairs:                                           
         #ADD THE USERNAMES TO THE PROGRAM CHAIR LIST
-        newChair  = Users.get(Users.username == user_name)   
-        print newChair.username
-        newChair.PID = pid     
+        newChair  = Users.get(Users.username == user_name)
+        newChair.PID = pid
         newChair.save()
         message = "USER: {0} has been added as a program chair for pid: {1}".format(user_name,pid)
         log.writer("INFO", page, message)

app/errorHandler.py

@@ -1,4 +1,4 @@
-from allImports import *
+from app.allImports import *
 
 @app.errorhandler(403)
 def pageNotFound(e):

app/index.py

@@ -1,5 +1,5 @@
 # This is the home page for bcsr
-from allImports import *
+from app.allImports import *
 @app.route("/", methods = ["GET"])
 def start():
     #TODO: FIND OUT HOW TO CATCH THE USERNAME FROM THE LOGIN PROCESS

app/loadConfig.py

@@ -10,5 +10,5 @@
 
 def load_config(file):
     with open(file, 'r') as ymlfile:
-        cfg = yaml.load(ymlfile)
-    return cfg
+        cfg = yaml.load(ymlfile, Loader=yaml.FullLoader)
+    return cfg

app/logic/databaseInterface.py

@@ -1,4 +1,5 @@
 from app.allImports import *
+from app.models import *
 
 def grab_current_semester():
     semesters = Semesters.select()
@@ -81,7 +82,6 @@ def get_course_instructors(CID):
   instructors_string = ''
   instructors = UsersCourses.select().where(UsersCourses.CID == CID)
   for instructor in instructors:
-    print instructor.username.username
     instructors_string += instructor.username.username
   return instructors_string
 

app/logic/excelMaker.py

@@ -1,10 +1,12 @@
 import xlsxwriter
 from app.allImports import *
 import sys
+from app.models import UsersCourses, Courses
+
 
 def makeExcelFile(SEID):
     filename = "bcsr-{}-missing-syllabi.xlsx".format(SEID)
-    path = getAbsolutePath(cfg['fileOperations']['dataPaths']['tmp'],filename,False)
+    path = getAbsolutePath(cfg['fileOperations']['dataPaths']['tmp'], filename, False)
     workbook = xlsxwriter.Workbook(path)
     workbook.set_properties({
         'title':    'Missing Syllabi for {}'.format(SEID),

app/logic/getAuthUser.py

@@ -1,6 +1,7 @@
 '''Any function that is related to user information or authentication should
 be located here'''
 from app.allImports import *
+from app.models import Users
 
 class AuthorizedUser:
   def __init__(self):

app/logic/getCourses.py

@@ -13,7 +13,7 @@ def check_for_my_courses(self,SEID):
     try: 
       temp_courses = UsersCourses.get(UsersCourses.username == self.username)
       my_courses   = databaseInterface.grab_my_courses(self.username,SEID)
-    except DoesNotExist:
+    except Exception:   # Using blanket exception, DoesNotExist no longer exists...
       my_courses = None
     return my_courses
 

app/logic/getSystemManagement.py

@@ -1,6 +1,7 @@
 from app.allImports import *
 from app.logic import databaseInterface 
 import time
+from app.models import Semesters
 
 class GetSystemManagement():
   '''Purpose: This class should hold any method directly related to
@@ -31,7 +32,6 @@ def create_seid(self, data):
     @key   -year => {string}
     @key   -term => {integer}
     '''
-    print 'inside create'
     year = data['year']
     term_key  = str(data['term'])
     #same year is a list of all term keys that go off the current year, 
@@ -42,8 +42,6 @@ def create_seid(self, data):
         seid = year + term_key
       else:
         seid = str(int(year)-1) + term_key
-
-    print "This is the SEID: " + str(seid)
     return seid
 
   def add_semester(self, data):

app/logic/getUploads.py

@@ -54,7 +54,7 @@ def check_path_exist(self,path):
           os.makedirs(path)
           app.logger.info("Directories made: {0}".format(path))
         except OSError as e:
-          print e.errno
+          print(e.errno)
           app.logger.error("Error making directories: {0}".format(e.errno))
           pass
     return 0