fixed budget downloading error

sheggen · sheggen · commit 8b6d24f07836 · 2018-12-13T08:46:52.000-05:00
diff --git a/api/API/makeExcel.py b/api/API/makeExcel.py
@@ -53,7 +53,7 @@ def makeBudgetExcel():
 
   workbook = xlsxwriter.Workbook(writeFilePath)
   workbook.set_properties({
-  'title':    'Budget for {}'.format(applicationCycle.year),
+  'title':    'Budget for {}'.format(params.year),
   'author':   'URCPP System',
   'comments': 'Created with Python and XlsxWriter'})
   
diff --git a/api/templates/committee/_navTabs.html b/api/templates/committee/_navTabs.html
@@ -0,0 +1,5 @@
+<ul class="nav nav-tabs">
+  {% for menuItem in cfg["committee"] %}
+    <li role="presentation"><a href="{{url_for(menuItem['link'])}}">{{menuItem['title']}}</a></li>
+  {% endfor %}
+</ul>
diff --git a/sync_faculty.py b/sync_faculty.py
@@ -28,26 +28,37 @@ def safe (d, k):
   result = ""
   try:
     if k in d:
+      print("Result: ", d[k])
       result = d[k]
   # If we can't find a key, skip it.
   except:
+    print("Skipping: ", d, k)
     pass
-  
   return result
     
 # Recreate the table.
 theStaticDB.create_table(LDAPFaculty)
 
 faculty = conn.entries
 for fac in faculty:
-  print ("Faculty: {0}".format(fac.samaccountname))
-  o = LDAPFaculty (
-    lastname  = safe (fac, 'sn'),
-    firstname = safe (fac, 'givenname'),
-    username  = fac.samaccountname,
-    bnumber   = safe (fac, 'employeeid'),
-    )
-  o.save()
+  try:
+    if str(fac.samaccountname) != 'ptfaculty':
+      print ("Faculty: {0}".format(fac.samaccountname))
+      o, c = LDAPFaculty.get_or_create(
+		lastname = safe (fac, 'sn'),
+     		firstname = safe (fac, 'givenname'),
+    		username  = fac.samaccountname,
+    		bnumber   = safe (fac, 'employeeid')
+    		)
+  except:
+    print("Error")
+  #o = LDAPFaculty (
+  #  lastname  = safe (fac, 'sn'),
+  #  firstname = safe (fac, 'givenname'),
+  #  username  = fac.samaccountname,
+  #  bnumber   = safe (fac, 'employeeid'),
+  #  )
+  #o.save()
   
   
 # Now do Staff
@@ -61,11 +72,21 @@ def safe (d, k):
 
 faculty = conn.entries        #actually staff, but who cares?
 for fac in faculty:
-  print ("Staff: {0}".format(fac.samaccountname))
-  o = LDAPFaculty (
-    lastname  = safe (fac, 'sn'),
-    firstname = safe (fac, 'givenname'),
-    username  = fac.samaccountname,
-    bnumber   = safe (fac, 'employeeid'),
-    )
-  o.save()
+  try: 
+    if str(fac.samaccountname) != 'ptfaculty':
+      print ("Staff: {0}".format(fac.samaccountname))
+      o, c = LDAPFaculty.get_or_create(
+		lastname = safe (fac, 'sn'),
+     		firstname = safe (fac, 'givenname'),
+    		username  = fac.samaccountname,
+    		bnumber   = safe (fac, 'employeeid')
+    		) 
+  except: 
+    print("Error")
+#o = LDAPFaculty (
+#    lastname  = safe (fac, 'sn'),
+#    firstname = safe (fac, 'givenname'),
+#    username  = fac.samaccountname,
+#    bnumber   = safe (fac, 'employeeid'),
+#    )
+#  o.save()
