Update app.py

app.py

@@ -12,46 +12,46 @@ from copy import deepcopy
 #######################
 #First define the functions
 
-# def PrimeVisualTemplate(vTmplFl,FTrefFl,TempRefFl):
-#     primedTemplateName=tls.translate_Visual_Template(vTmplFl,FTrefFl,TempRefFl)
-#     return primedTemplateName,primedTemplateName,datetime.now(),datetime.now(),FTrefFl.name,TempRefFl.name #Return twice so as to send file to two interface entities (file holders), plus time stampers, return the refusal sheets to send to B
+def PrimeVisualTemplate(vTmplFl,FTrefFl,TempRefFl):
+    primedTemplateName=tls.translate_Visual_Template(vTmplFl,FTrefFl,TempRefFl)
+    return primedTemplateName,primedTemplateName,datetime.now(),datetime.now(),FTrefFl.name,TempRefFl.name #Return twice so as to send file to two interface entities (file holders), plus time stampers, return the refusal sheets to send to B
 
-# def GenerateSchedule(schedWWF,xtraDays,wkHrs,DaysCrew,AssnFl,FTrefFl,TempRefFl,PollFl,stop1=0,stop2=0,template=False):
-#     stop=(stop1,stop2)
-#     assnWWF=schedWWF
-#     if assnWWF=='Yes': assnWWF=True
-#     if assnWWF=='No': assnWWF=True
-#     xtraDays=xtraDays
-#     Acrew=DaysCrew
-#     wkHrs=wkHrs
-#     mySched=tls.preProcessData(Acrew,wkHrs,FTrefFl,TempRefFl,AssnFl,PollFl,assnWWF=assnWWF,xtraDays=xtraDays)
-#     mySched.evalAssnList()
-#     mySched.proofEligVol()
-#     mySched.proofEligVol()#i don't know man i found in testing sometimes it wasnt completing properly the first time around
-#     if template==True: #Case of template viewer
-#         flNm=mySched.printToExcel()
-#         return flNm,datetime.now()
-#     sch=mySched.fillOutSched_v3(stop=stop) #Stop is not None when submitted from tab C
-#     flNm=sch.printToExcel()
-#     return flNm,datetime.now()
+def GenerateSchedule(schedWWF,xtraDays,wkHrs,DaysCrew,AssnFl,FTrefFl,TempRefFl,PollFl,stop1=0,stop2=0,template=False):
+    stop=(stop1,stop2)
+    assnWWF=schedWWF
+    if assnWWF=='Yes': assnWWF=True
+    if assnWWF=='No': assnWWF=True
+    xtraDays=xtraDays
+    Acrew=DaysCrew
+    wkHrs=wkHrs
+    mySched=tls.preProcessData(Acrew,wkHrs,FTrefFl,TempRefFl,AssnFl,PollFl,assnWWF=assnWWF,xtraDays=xtraDays)
+    mySched.evalAssnList()
+    mySched.proofEligVol()
+    mySched.proofEligVol()#i don't know man i found in testing sometimes it wasnt completing properly the first time around
+    if template==True: #Case of template viewer
+        flNm=mySched.printToExcel()
+        return flNm,datetime.now()
+    sch=mySched.fillOutSched_v3(stop=stop) #Stop is not None when submitted from tab C
+    flNm=sch.printToExcel()
+    return flNm,datetime.now()
 
-# def GenerateSchedule1(schedWWF,xtraDays,wkHrs,DaysCrew,AssnFl,FTrefFl,TempRefFl,PollFl,stop=None,template=True):
-#     assnWWF=schedWWF
-#     if assnWWF=='Yes': assnWWF=True
-#     if assnWWF=='No': assnWWF=True
-#     xtraDays=xtraDays
-#     Acrew=DaysCrew
-#     wkHrs=wkHrs
-#     mySched=tls.preProcessData(Acrew,wkHrs,FTrefFl,TempRefFl,AssnFl,PollFl,assnWWF=assnWWF,xtraDays=xtraDays)
-#     mySched.evalAssnList()
-#     mySched.proofEligVol()
-#     mySched.proofEligVol()#i don't know man i found in testing sometimes it wasnt completing properly the first time around
-#     if template==True: #Case of template viewer
-#         flNm=mySched.printToExcel()
-#         return flNm,datetime.now()
-#     sch=mySched.fillOutSched_v3(stop=stop) #Stop is not None when submitted from tab C
-#     flNm=sch.printToExcel()
-#     return flNm,datetime.now()
+def GenerateSchedule1(schedWWF,xtraDays,wkHrs,DaysCrew,AssnFl,FTrefFl,TempRefFl,PollFl,stop=None,template=True):
+    assnWWF=schedWWF
+    if assnWWF=='Yes': assnWWF=True
+    if assnWWF=='No': assnWWF=True
+    xtraDays=xtraDays
+    Acrew=DaysCrew
+    wkHrs=wkHrs
+    mySched=tls.preProcessData(Acrew,wkHrs,FTrefFl,TempRefFl,AssnFl,PollFl,assnWWF=assnWWF,xtraDays=xtraDays)
+    mySched.evalAssnList()
+    mySched.proofEligVol()
+    mySched.proofEligVol()#i don't know man i found in testing sometimes it wasnt completing properly the first time around
+    if template==True: #Case of template viewer
+        flNm=mySched.printToExcel()
+        return flNm,datetime.now()
+    sch=mySched.fillOutSched_v3(stop=stop) #Stop is not None when submitted from tab C
+    flNm=sch.printToExcel()
+    return flNm,datetime.now()
 
 
 #######################
@@ -114,8 +114,8 @@ with gr.Blocks() as demo:
     
     #######################
     # #Third Define the Interactions
-    # A_bt_PT.click(PrimeVisualTemplate,[A_fl_VT,A_fl_FTref,A_fl_Tref],[A_fl_PT,B_fl_PT,A_tx_PTtimestamp,B_tx_PTtimestamp,B_fl_FTref,B_fl_Tref])
-    # B_bt_MS.click(GenerateSchedule,[B_wwfOT,B_xtraDay,B_wkHrs,B_dayCrew,B_fl_PT,B_fl_FTref,B_fl_Tref,B_fl_Pl],[B_fl_FS,B_tx_FTtimestamp])
-    # C_bt_MT.click(GenerateSchedule1,[B_wwfOT,B_xtraDay,B_wkHrs,B_dayCrew,B_fl_PT,B_fl_FTref,B_fl_Tref,B_fl_Pl],[C_fl_T,C_tx_Ttimestamp])
-    # C_bt_PS.click(GenerateSchedule,[B_wwfOT,B_xtraDay,B_wkHrs,B_dayCrew,B_fl_PT,B_fl_FTref,B_fl_Tref,B_fl_Pl,C_nm_IN,C_nm_PS],[C_fl_PS,C_tx_ts2])
+    A_bt_PT.click(PrimeVisualTemplate,[A_fl_VT,A_fl_FTref,A_fl_Tref],[A_fl_PT,B_fl_PT,A_tx_PTtimestamp,B_tx_PTtimestamp,B_fl_FTref,B_fl_Tref])
+    B_bt_MS.click(GenerateSchedule,[B_wwfOT,B_xtraDay,B_wkHrs,B_dayCrew,B_fl_PT,B_fl_FTref,B_fl_Tref,B_fl_Pl],[B_fl_FS,B_tx_FTtimestamp])
+    C_bt_MT.click(GenerateSchedule1,[B_wwfOT,B_xtraDay,B_wkHrs,B_dayCrew,B_fl_PT,B_fl_FTref,B_fl_Tref,B_fl_Pl],[C_fl_T,C_tx_Ttimestamp])
+    C_bt_PS.click(GenerateSchedule,[B_wwfOT,B_xtraDay,B_wkHrs,B_dayCrew,B_fl_PT,B_fl_FTref,B_fl_Tref,B_fl_Pl,C_nm_IN,C_nm_PS],[C_fl_PS,C_tx_ts2])
 demo.launch()