Update SchedBuilderUtyModule.py

SchedBuilderUtyModule.py

@@ -315,16 +315,18 @@ def makeEEdict(ftInfoTbl,tempInfoTbl,wkHrs=40,tp='id'):
         for row in dtaTbl:
             # if row[1].lower().strip() in ['wwf','bud','blue','rock','silver','gold','student']: #Omit people not in packaging, or off, vacation etc
             if row[2] not in list(eeDict.keys()): #Double check ee hasn't already been generated... why Cory would include an ee on temp table with crew reading 'fulltime' is beyond me but there you go
-                eeSkills=viewTBL('sklMtx',['trnNm'],filterOn=[('EEID',row[2])])
-                eeSkills=[trnToDisp(nm[0]) for nm in eeSkills] #Gather display names for skills trained on, reducing lists within list to spread elements
-                sk=[] #Create empty to accumulate all skills present within sublists of eeSkills
-                for s in eeSkills:
-                    sk.extend(s)
-                sen=viewTBL('senRef',fields=['sen'],filterOn=[('id',str(row[2]))])[0][0]
-                anEE=ee(sen,row[1].lower().strip(),int(row[2]),row[3],row[4],row[5],row[8]+wkHrs,skills=sk) #Pull info from Refusals sheet
                 if tp=='id':
+                    eeSkills=viewTBL('sklMtx',['trnNm'],filterOn=[('EEID',row[2])])
+                    eeSkills=[trnToDisp(nm[0]) for nm in eeSkills] #Gather display names for skills trained on, reducing lists within list to spread elements
+                    sk=[] #Create empty to accumulate all skills present within sublists of eeSkills
+                    for s in eeSkills:
+                        sk.extend(s)
+                    sen=viewTBL('senRef',fields=['sen'],filterOn=[('id',str(row[2]))])[0][0]
+                    anEE=ee(sen,row[1].lower().strip(),int(row[2]),row[3],row[4],row[5],row[8]+wkHrs,skills=sk) #Pull info from Refusals sheet
                     eeDict[anEE.eeID]=anEE
                 elif tp=='nm':
+                    #Just need peoples names and EEID's linked from this.. enter dummy data for seniority, training, etc
+                    anEE=ee(1,row[1].lower().strip(),int(row[2]),row[3],row[4],row[5],row[8]+wkHrs,skills=[])
                     eeDict[anEE.dispNm().lower().replace(' ','-')]=anEE
     return eeDict
 
@@ -365,17 +367,7 @@ def getEEinfo(FtBook,TempBook):  #Need to make volunteer shift data puller
     
     addTBL("FTinfo",fields=['sen','crew','id','last','first','ytd','totref','totchrg','wtdOT'],data=a,addOn=False)
     addTBL("TempInfo",fields=['sen','crew','id','last','first','ytd','totref','totchrg','wtdOT'],data=c,addOn=False)
-    addTBL("sklMtx",fields=["EEID","trnNm"],data=b,addOn=False) #Overwrite all training data and populate FT ops, then append temps for a master table
-    addTBL("sklMtx",fields=["EEID","trnNm"],data=d,addOn=True)
-    #Generate a master seniority table.. following replaces hire date with integers for temps
-    senHiLoTemps=viewTBL('TempInfo',sortBy=[('sen','ASC')]) #First retrieve list of temps, most senior to least
-    i=100000 #Start new seniority number at arbitrarily high value not to interfere with full timer
-    for row in senHiLoTemps:
-        row[0]=i
-        i+=1
-    #Overwrite/make new master sen ref table. Then append the Temp data with integerized values
-    addTBL("senRef",fields=['sen','crew','id','last','first','ytd','totref','totchrg','wtdOT'],data=a,addOn=False)
-    addTBL("senRef",fields=['sen','crew','id','last','first','ytd','totref','totchrg','wtdOT'],data=senHiLoTemps,addOn=True)
+
     return a,c
 
 def addRecs(flNm,shNm,tblNm,data):