Merge branch 'master' into quality-of-life

Author: BrianRamsay

application/controllers/allCont/ChemTableController.py

@@ -21,13 +21,13 @@ def ChemTable():
   if userLevel == -1 or user == -1:
     abort(403)
   print user.username, userLevel
-  
-  chemicals = getChemicals() #Get all chemicals from the database
-  contDict = contCount(chemicals)
-  
+
+  contDict = contCount(getChemicals())
+  containers = getAllDataAboutContainers()
+
   return render_template("views/ChemTableView.html",
                           config = config,
-                          chemicals = chemicals,
+                          containers = containers,
                           contDict = contDict,
                           quote = quote,
                           authLevel = userLevel)

application/models/containersModel.py

@@ -2,8 +2,13 @@
 from application.models.chemicalsModel import Chemicals
 from application.models.storagesModel import Storages
 from application.models.roomsModel import *
+from application.models.roomsModel import Rooms
+from application.models.storagesModel import Storages
+from application.models.floorsModel import Floors
+from application.models.buildingsModel import Buildings
 import datetime
 
+
 class Containers (Model):
   conId              = PrimaryKeyField()
   ##Foreign Keys
@@ -118,7 +123,7 @@ def getContainers(storage):
     Containers.get(Containers.storageId == storage,
                    Containers.disposalDate == None)
   except Exception as e:
-    return False 
+    return False
 
 def disposeContainer(bId):
     try:
@@ -129,3 +134,11 @@ def disposeContainer(bId):
     except Exception as e:
         return (False, "Container "+ bId +" was could not be removed!", "list-group-item list-group-item-danger")
 
+def getAllDataAboutContainers():
+    conts = (Containers.select() \
+                .join(Chemicals, on = (Containers.chemId == Chemicals.chemId)) \
+                .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)))
+    return conts

application/queries/locationReportQueries.py

@@ -20,7 +20,7 @@ def getChemInLoc(loc_data):
     for value in loc_data:
         if (loc_data[value] != "*") and (value in loc_cons):
             wheres &= eval(loc_cons[value])
-        elif value in haz_cons: 
+        elif value in haz_cons:
             haz_where |= eval(haz_cons[value])
         else:
             #No conditional provided
@@ -82,4 +82,3 @@ def getIAFlamLiquids():
                     .where((Chemicals.flashPoint < 73) & (Chemicals.boilPoint < 100))) \
                     .switch(Containers)
     return allIAFlam
-

application/static/js/local/chemFile.js

@@ -1,17 +1,18 @@
 var table;
 var cookie;
+
 function createTable(){
     table = $('#chemtable').DataTable({
 	    "columnDefs": [
-		{
-		    "targets": 'Barcodes',
-		    "visible": false
-		},
-		{
-		    "targets": 'nosort',
-		    "searchable": false
-		}
-	                  ]
+  		{
+  		    "targets": 'Barcodes',
+  		    "visible": false
+  		},
+  		{
+  		    "targets": 'nosort',
+  		    "searchable": false
+  		}
+    ]
    });
   getCookie('savedSearch')
   addClearButton()
@@ -59,8 +60,8 @@ function getCookie(cname) {
 		    return true;
 		}
  	    }
-    }  
-    return "";	
+    }
+    return "";
 }
 
 function find_cookie ( cookie_name ){
@@ -91,7 +92,7 @@ function reload_table(cookie){
 }
 
 function destroyCookie(cookieKey){
-   
+
    document.cookie = cookieKey+"=; expires=Fri, 5 July 2017 12:00:00 UTC; path=/";
    reload_table("");
 

application/templates/snips/ChemFile.html

@@ -12,22 +12,26 @@ <h1>View All Chemicals</h1>
                     <th>CAS Number</th>
                     <th class="nosort">Color Code</th>
                     <th class="nosort">In Stock</th>
+                    <th>Hazards</th>
+                    <th>Location</th>
                     <th class="Barcodes">Barcodes</th>
                   </tr>
             </thead>
-            {% for chemical in chemicals %}
-                {% if chemical.remove == False %}
-                   <tr onclick="cookieSaveAndRedirect('../ViewChemical/{{chemical.chemId}}/');"> {# The whole row is a link to the correct chemical page #}
-                        <td>{{chemical.name}}</td>
-                        <td>{{chemical.casNum}}</td>
-                        {% if config.hazards[chemical.primaryHazard] is defined %}
-                            <td>{{config.hazards[chemical.primaryHazard].hazardColor}}</td>
+            {% for container in containers %}
+                {% if container.chemId.remove == False %}
+                   <tr onclick="cookieSaveAndRedirect('../ViewChemical/{{container.chemId.chemId}}/');"> {# The whole row is a link to the correct chemical page #}
+                        <td>{{container.chemId.name}}</td>
+                        <td>{{container.chemId.casNum}}</td>
+                        {% if config.hazards[container.chemId.primaryHazard] is defined %}
+                            <td>{{config.hazards[container.chemId.primaryHazard].hazardColor}}</td>
                         {% else %}
                             <td>Not Available</td>
                         {% endif %}
-                        <td>{{contDict[chemical.name] | length}}</td>
+                        <td>{{contDict[container.chemId.name] | length}}</td>
+                        <td>{{container.chemId.primaryHazard}}</td>
+                        <td>{{container.storageId.roomId.floorId.buildId.name}}-{{container.storageId.roomId.name}}</td>
                         <td>
-                            {% for container in contDict[chemical.name] %}
+                            {% for container in contDict[container.chemId.name] %}
                                 {{container.barcodeId}}
                             {% endfor %}
                         </td>
@@ -36,9 +40,8 @@ <h1>View All Chemicals</h1>
             {%endfor%}
             <script>
             $(document).ready(createTable());
-                        
+
             </script>
         </table>
     </div>
 </div>
-

config/config.yaml

@@ -129,7 +129,8 @@ export:
 
 DEBUG:
   user: "heggens" # default user - admin
+  # user: "manalaih_ssdt"
   # user: "ballz" #admin
   # user: "hooverk" #systemAdmin
   # user: "thakurr" #superUser
-  # user: "williamsk" #systemUser
+  # user: "williamsk" #systemUser

config/roles.yaml

@@ -2,7 +2,8 @@
 admin:
   - ubuntu #For Testing
   - hooverk
-  - insengrim 
+  - insengrim
+  - ramsayb2
 #  - database Roles
 
 systemAdmin: