| @@ -162,8 +162,8 @@ |
| ecoliSummary, ecoliStandard, displaySummary, flagSummary = self.EColiCalc( |
| startDatePOR, chronicData, segmentSummary, displaySummary, flagSummary |
| ) # self.EColiCalc(rEcs, chronicData, startPOR) #reads ecoli data off of AcuteData tab |
| - nutrientSummary, notes = self.NutCalc( |
| - chronicData, segmentSummary, notes |
| + nutrientSummary, displaySummary, notes = self.NutCalc( |
| + chronicData, segmentSummary, displaySummary, notes |
| ) # self.NutCalc(acuteData, rEcs, startrow, silent) |
| flagSummary, notes = self.FindFlags( |
| flagSummary, displaySummary, notes |
| @@ -2599,34 +2599,35 @@ |
| # ag |
| displaySummary[key]["Agriculture (TREC)"] = "NS" # DisMat(6, 56) = "NS" |
| elif key == "TKN-T": # Case 57 #TKN-T #not in Data Base so not dynamic yet |
| - # chronic |
| - displaySummary[key]["Chronic"] = "NS" # DisMat(3, 57) = "NS" |
| - # acute |
| - displaySummary[key]["Acute"] = "NS" # DisMat(4, 57) = "NS" |
| - # ws |
| - displaySummary[key]["Water Supply"] = "NS" # DisMat(5, 57) = "NS" |
| - # ag |
| - displaySummary[key]["Agriculture (TREC)"] = "NS" # DisMat(6, 57) = "NS" |
| - elif key == "TN-T": # Case 58 #TN-T #not in Data Base so not dynamic yet |
| - # chronic |
| - displaySummary[key]["Chronic"] = "NS" # DisMat(3, 58) = "NS" |
| - # acute |
| - displaySummary[key]["Acute"] = "NS" # DisMat(4, 58) = "NS" |
| - # ws |
| - displaySummary[key]["Water Supply"] = "NS" # DisMat(5, 58) = "NS" |
| - # ag |
| - displaySummary[key]["Agriculture (TREC)"] = "NS" # DisMat(6, 58) = "NS" |
| - elif ( |
| - key == "TP-T" |
| - ): # Case 59 #TP-T #handeled in a diffrent manner. look in NutCalcs |
| - # chronic |
| - displaySummary[key]["Chronic"] = "NS" # DisMat(3, 59) = "NS" |
| - # acute |
| - displaySummary[key]["Acute"] = "NS" # DisMat(4, 59) = "NS" |
| - # ws |
| - displaySummary[key]["Water Supply"] = "NS" # DisMat(5, 59) = "NS" |
| - # ag |
| - displaySummary[key]["Agriculture (TREC)"] = "NS" # DisMat(6, 59) = "NS" |
| + pass #switched to match Temperature with skipping parsing the standard, tcw |
| + ## chronic |
| + #displaySummary[key]["Chronic"] = "NS" # DisMat(3, 57) = "NS" |
| + ## acute |
| + #displaySummary[key]["Acute"] = "NS" # DisMat(4, 57) = "NS" |
| + ## ws |
| + #displaySummary[key]["Water Supply"] = "NS" # DisMat(5, 57) = "NS" |
| + ## ag |
| + #displaySummary[key]["Agriculture (TREC)"] = "NS" # DisMat(6, 57) = "NS" |
| + elif key == "TN-T": # Case 58 #TN-T #handeled in a diffrent manner. look in NutCalcs |
| + pass #switched to match Temperature with skipping parsing the standard, tcw |
| + ## chronic |
| + #displaySummary[key]["Chronic"] = "NS" # DisMat(3, 58) = "NS" |
| + ## acute |
| + #displaySummary[key]["Acute"] = "NS" # DisMat(4, 58) = "NS" |
| + ## ws |
| + #displaySummary[key]["Water Supply"] = "NS" # DisMat(5, 58) = "NS" |
| + ## ag |
| + #displaySummary[key]["Agriculture (TREC)"] = "NS" # DisMat(6, 58) = "NS" |
| + elif key == "TP-T": # Case 59 #TP-T #handeled in a diffrent manner. look in NutCalcs |
| + pass #switched to match Temperature with skipping parsing the standard, tcw |
| + ## chronic |
| + #displaySummary[key]["Chronic"] = "NS" # DisMat(3, 59) = "NS" |
| + ## acute |
| + #displaySummary[key]["Acute"] = "NS" # DisMat(4, 59) = "NS" |
| + ## ws |
| + #displaySummary[key]["Water Supply"] = "NS" # DisMat(5, 59) = "NS" |
| + ## ag |
| + #displaySummary[key]["Agriculture (TREC)"] = "NS" # DisMat(6, 59) = "NS" |
| elif key == "U-D": # Case 60 #U-D |
| # chronic |
| if self.checkNumeric( |
| @@ -2811,8 +2812,8 @@ |
| "Standard" |
| ] # DisMat(6, 63) = Worksheets("Segment_Std").Cells(29, 8).Value |
| |
| - # Added check for None standards to be replaced with "NS" unless they are temperature, leave those blank. tcw |
| - temperatureKeyList = ["Temp(s) C", "Temp(w) C"] |
| + # Added check for None standards to be replaced with "NS" unless they are temperature or nutrients, leave those blank. tcw |
| + temperatureKeyList = ["Temp(s) C", "Temp(w) C", "TKN-T", "TN-T", "TP-T"] |
| if key not in temperatureKeyList and ( |
| displaySummary[key]["Chronic"] == None |
| or displaySummary[key]["Chronic"] == "" |
| @@ -7001,7 +7002,7 @@ |
| # #Sheets("Summary").Select |
| # |
| # |
| - def NutCalc(self, acuteData, segmentSummary, notes): |
| + def NutCalc(self, acuteData, segmentSummary, displaySummary, notes): |
| # X, Y, z |
| # bigger |
| # ST, ST2 |
| @@ -7466,7 +7467,12 @@ |
| # # End if |
| # End if |
| nutrientSummary = {"nutrientTable": nutrientTable, "nutrientData": nutrientData} |
| - return nutrientSummary, notes |
| + |
| + # remove this when we make nutrients work in this tool like metals, tcw |
| + displaySummary["TKN-T"]["Status"] = "tool does not evaluate" |
| + displaySummary["TN-T"]["Status"] = "Check Nutrient Summary Tab" |
| + displaySummary["TP-T"]["Status"] = "Check Nutrient Summary Tab" |
| + return nutrientSummary, displaySummary, notes |
| |
| def findNutrientData( |
| self, acuteData, Row, ST_TF, ST2_TF |