Added alot of stuff

Author: eykrevooh

application/config.py

@@ -38,6 +38,10 @@
 addLocationConfig_path = getAbsolutePath('config/locations.yaml')
 addLocationConfig = Configuration.from_file(addLocationConfig_path).configure()
 
+# Populates database with all locations added to reports.yaml
+reportConfig_path = getAbsolutePath('config/reports.yaml')
+reportConfig = Configuration.from_file(reportConfig_path).configure()
+
 # This adds the application's base directory to the
 # configuration object, so that the rest of the application
 # can reference it.

application/controllers/allCont/ReportController.py

@@ -1,14 +1,20 @@
 from application import app
 from application.config import *
+from application.models import *
+from application.models.floorsModel import *
+from application.models.roomsModel import *
+from application.models.storagesModel import *
 from application.logic.getAuthUser import AuthorizedUser
 from application.logic.excelMaker import *
+from playhouse.shortcuts import model_to_dict, dict_to_model
 
 
 from flask import render_template, \
                   request, \
                   flash, \
                   redirect, \
-                  url_for
+                  url_for, \
+                  jsonify
 
 @app.route('/Report/', methods = ['GET', 'POST'])
 def report():
@@ -18,10 +24,37 @@ def report():
 
     if userLevel == 'admin':
         if request.method == "GET":
+            allBuild = getBuildings()
             return render_template("views/ReportView.html",
                                    authLevel = userLevel,
-                                   config = config)
+                                   config = config,
+                                   reportConfig = reportConfig,
+                                   allBuild = allBuild)
         else:
             data = request.form
-            genLocationReport(data['test'])
+            print data
+            locData = genLocationReport(data)
+            #print addReportsConfig["locationQuantity"]["row_title"]
+            #exportExcel("Test", reportConfig["locationQuantity"]["row_title"], reportConfig["locationQuantity"]["queries"], )
             return redirect(url_for("report"))
+
+@app.route('/locationData/', methods = ['GET'])
+def locationData():
+    locId = request.args.get('locId')
+    locType = request.args.get('locType')
+    print locType
+    if locType == "Building":
+        locObject = getFloors(locId)
+        objectType = "Floor"
+    elif locType == "Floor":
+        locObject = getRooms(locId)
+        objectType = "Room"
+    elif locType == "Room":
+        locObject = getStorages(locId)
+        objectType = "Storage"
+    locs = list()
+    for loc in locObject:
+        locs.append(model_to_dict(loc))
+    return jsonify({'status':'OK',
+                    'locObject' : locs,
+                    'objectType' : objectType})

application/logic/\

@@ -0,0 +1,42 @@
+from openpyxl import Workbook
+import datetime
+from application import app
+from application.config import *
+from application.queries.locationReportQueries import *
+from application.queries.hazardReportQueries import *
+
+def exportExcel(title, row_headers, indexes, objects):
+    book = Workbook()
+    sheet = book.active
+    sheet.title = title
+    sheet.append(row_headers)
+    book.save(filename = config["export"]["path"])
+
+def genLocationReport(loc_id):
+    """
+    Returns a file of all chemicals and containers in a location
+    """
+    print loc_id
+    #for cont in getChemInStor(loc_id):
+    #    print cont.chemId.name
+    #for cont in getChemInRoom(loc_id):
+    #    print cont.barcodeId
+    #for cont in getChemInFloor(loc_id):
+    #    print cont.barcodeId
+    #for cont in getChemInBuild(loc_id):
+    #    print cont.barcodeId
+    for cont in getIBFlamLiquids():
+        print cont.barcodeId
+    return 0
+
+def genHazardReport(building):
+    """
+    Returns the quantity of each hazard by floor in building
+    """
+    return 0
+
+def genSpecialHazardList():
+    """
+    Returns all special hazards (Peroxide, Pressure, Toxin/Time, Req_Stabalizer)
+    """
+    return 0

application/logic/excelMaker.py

@@ -5,29 +5,24 @@
 from application.queries.locationReportQueries import *
 from application.queries.hazardReportQueries import *
 
-def exportExcel(title):
+def exportExcel(title, row_headers, indexes, objects):
     book = Workbook()
     sheet = book.active
     sheet.title = title
-    sheet.append(['Row1', 'Row2', 'Row3'])
+    sheet.append(row_headers)
+    for row in range(len(objects)):
+        for col in range(len(row_headers)):
+            ##Writes out each cell with the correct value, objects found in yaml
+            sheet.cell(column=col+1, row=row+2, value = eval(indexes[row_headers[col].replace(" ", "_")]))
     book.save(filename = config["export"]["path"])
 
-def genLocationReport(loc_id):
+def genLocationReport(locData):
     """
     Returns a file of all chemicals and containers in a location
     """
-    print loc_id
-    #for cont in getChemInStor(loc_id):
-    #    print cont.chemId.name
-    #for cont in getChemInRoom(loc_id):
-    #    print cont.barcodeId
-    #for cont in getChemInFloor(loc_id):
-    #    print cont.barcodeId
-    #for cont in getChemInBuild(loc_id):
-    #    print cont.barcodeId
-    for cont in getIBFlamLiquids():
-        print cont.barcodeId
-    return 0
+    for cont in getChemInLoc(locData):
+        print cont.chemId.name
+    return getChemInLoc(locData)
 
 def genHazardReport(building):
     """

application/queries/locationReportQueries.py

@@ -7,6 +7,27 @@
 from application.models.buildingsModel import *
 from application.models.historiesModel import *
 
+def getChemInLoc(loc_data):
+    ##Returns all containers, chem in Storages and rooms and floors in build
+    conditionals = {"Building":"Buildings.bId == loc_data['Building']", "Floor":"Floors.fId == loc_data['Floor']", "Room":"Rooms.rId == loc_data['Room']", "Storage":"Storages.sId == loc_data['Storage']"}
+    if loc_data["Building"] != "*":
+        wheres = eval(conditionals["Building"])
+        for value in loc_data:
+            if value == "Building":
+                pass
+            elif loc_data[value] != "*":
+                wheres &= eval(conditionals[value])
+    else:
+        wheres = Buildings.name == Buildings.name
+    conts = (Containers.select() \
+                .join(Storages, on = (Containers.storageId == Storages.sId)) \
+                .join(Rooms, on = (Rooms.rId == Storages.roomId)) \
+                .join(Floors, on = (Floors.fId == Rooms.floorId)) \
+                .join(Buildings, on = (Buildings.bId == Floors.buildId)) \
+                .where(wheres)\
+                .switch(Containers))
+    return conts
+
 def getChemInStor(s_id):
     ##Done cont.storageId.roomId.floorId.buildId.name
     conts = (Containers.select() \

application/reports/Report.xlsx

@@ -3,9 +3,7 @@ function CheckInModal(name,barcode,lastroom,newQuantity,newroom){
    var check = checkValues(list);
    if (check == true) {
      printdata(name,barcode,lastroom,newQuantity,newroom);
-     
    }
-  
 }
 
 function checkValues(list){
@@ -32,6 +30,3 @@ function printdata(name,barcode,lastroom,newQuantity,newroom){
       $('.chemdata').append("<li>NewRoom:" +newroomy+"</li>")
       $("#myModal").modal('show');
 }
-
-
- 

application/static/js/local/Checkin.js

@@ -47,4 +47,4 @@ function getData(barcodeId, formAction){
             console.log(data['status']) //TODO: change to write to a log file as well as console.
         }
     });
-}
+}

application/static/js/local/changeForm.js

@@ -0,0 +1,56 @@
+function getLocation(loc_type){
+  var locId = document.getElementById(loc_type).value;
+  if(locId == "*"){
+    reset_fields(loc_type)
+  }
+  else{
+    getData(locId, loc_type)
+  }
+}
+
+function reset_fields(loc_type){
+  if (loc_type == "Building"){
+    var locToDisable = ['#Floor', '#Room', '#Storage']
+  }
+  else if (loc_type == "Floor"){
+    var locToDisable = ['#Room', '#Storage']
+  }
+  else if (loc_type == "Room"){
+    var locToDisable = ['#Storage']
+  }
+  for(var i =0; i < locToDisable.length; i++){
+    $(locToDisable[i]).children('.default').prop('selected', true);
+    $(locToDisable[i]).prop('disabled', true);
+  }
+}
+
+function getData(locId, locType){
+  $.ajax({ //AJAX call to url "/getLocation/" to get location children
+    url: "/locationData/",
+    data: {locId : locId, locType : locType},
+    type: "GET",
+    success: function(data) {
+      if (data['status'] === 'OK'){
+        $('[name=' + data["objectType"] + ']').prop('disabled', false);
+        var options = "<option class='default' value='*'>All " + data["objectType"] + "s</option>"
+        for(var i = 0; i < data['locObject'].length; i++){
+          if (data['objectType'] == "Floor"){
+            options += '<option value="' + data['locObject'][i].fId  + '">' + data['locObject'][i].name + '</option>';
+          }
+          else if (data['objectType'] == "Room"){
+            options += '<option value="' + data['locObject'][i].rId  + '">' + data['locObject'][i].name + '</option>';
+        }
+          else if (data['objectType'] == "Storage"){
+            options += '<option value="' + data['locObject'][i].sId  + '">' + data['locObject'][i].name + '</option>';
+          }
+        }
+        $("select#" + data["objectType"]).html(options);
+      }
+    }
+  })
+}
+
+function enableFields(){
+  //This enables all fields on form so they get submitted
+  $('select:disabled').prop('disabled', false);
+}

application/static/js/local/reportFill.js

@@ -1,7 +1,25 @@
+<script src="/static/js/local/reportFill.js"></script>
 <div class="form container text-center">
-  <form name="report" method="post" class="form-group">
-    <p>Reports</p>
-    <input id="test" name="test" type="text" class="form-control" value="">
+  <form name="report" method="post" class="form-group" onsubmit="enableFields()">
+    {# Report Type Selection #}
+    <div class="reportTypes form-group row">
+      {% for report in reportConfig.ReportTypes.Inputs %}
+         {% if report == "Building" %}
+          <label class="co-xs-6">{{ report }}</label>
+          <select id="{{report}}" name="{{report}}" class="form-control"  onchange="getLocation('{{report}}')">
+          <option selected disable value="*">All {{report}}s</option>
+            {% for build in allBuild%}
+               <option value={{build.bId}}>{{  build.name }}</option>
+            {% endfor %}
+          </select>
+        {% else %}
+          <label class="co-xs-6">{{ report }}</label>
+          <select id="{{report}}" name="{{report}}" class="form-control"  onchange="getLocation('{{report}}')" required disabled>
+          <option selected value="*">All {{report}}s</option>
+          </select>
+        {% endif %}
+    {% endfor %}
+   </div>
     <input class="btn btn-primary btn-lg" id="requestReport" type="submit" value="Submit">
   </form>
 </div>

application/templates/snips/reports.html

@@ -0,0 +1,39 @@
+ReportTypes:
+  Inputs:
+    Building: "bId"
+    Floor: "fId"
+    Room: "rId"
+    Storage: "sId"
+    Hazard: "hId"
+  LocationBased:
+      name: "Location"
+      id: "loc"
+      LocationQuantity:
+        options:
+          - Building
+          - Floor
+          - Room
+          - Storage
+          - Hazard
+        row_title:
+          - Building
+          - Floor
+          - Room
+          - Storage
+          - Barcode
+          - Chemical Name
+          - Current Quantity
+          - Current Unit
+        queries:
+            Building: objects[row].storageId.roomId.floorId.buildId.name
+            Floor: objects[row].storageId.roomId.floorId.name
+            Room: objects[row].storageId.roomId.name
+            Storage: objects[row].storageId.name
+            Chemical_Name: objects[row].chemId.name
+            Primary_Hazard: objects[row].chemId.primaryHazard
+            Barcode: objects[row].barcodeId
+            Current_Quantity: objects[row].currentQuantity
+            Current_Unit: objects[row].currentQuantityUnit
+            Container_Capacity: objects[row].capacity
+            Container_Capacity_Unit: objects[row].capacityUnit
+            Manufacturer: objects[row].manufacturer

config/default

@@ -8,7 +8,6 @@
 from application.models.storagesModel import *
 from application.models.historiesModel import *
 from application.models.usersModel import *
-from application.config import *
 import random
 import datetime