Compare commits

...

4 Commits

Author SHA1 Message Date
Andreas Danzer (DE-701) a5b02fe634 Jenkinsfile online editiert mit Bitbucket
updated
2023-05-24 12:06:52 +00:00
Andreas Danzer (DE-701) bbd866ef42 summary.py online editiert mit Bitbucket
updated 99.5
2023-05-24 11:55:23 +00:00
Andreas Danzer (DE-701) 6837560763 summary.py online editiert mit Bitbucket
updated logic
2023-05-24 10:58:07 +00:00
Andreas Danzer (DE-701) 0545e72baf Jenkinsfile online editiert mit Bitbucket
fixed reciever
2023-05-24 10:50:56 +00:00
2 changed files with 15 additions and 14 deletions

3
Jenkinsfile vendored
View File

@ -154,7 +154,8 @@ def reportRetryCount = 0
//to: 'rene.forstner@nttdata.com, ermis.wieger@nttdata.com, patryk.gudalewicz.bp@nttdata.com',
//to: 'patryk.gudalewicz.bp@nttdata.com',
//to: 'rene.forstner@nttdata.com, ermis.wieger@nttdata.com, arnel.arnautovic@nttdata.com, patryk.gudalewicz.bp@nttdata.com, stephan.oertelt@bmw.de, Mohammed.Abadel@bmw.de, michaela.jaeger@bmw.de, OOC-Support@bmwgroup.com, Andreas.DB.Danzer@bmwgroup.com',
to: 'ermis.wieger@nttdata.com, Andreas.DB.Danzer@bmwgroup.com, OOC-Support@bmwgroup.com, michaela.jaeger@bmw.de, thilo.bindel@bmwgroup.com, Mohammed.Abadel@bmw.de, stephan.oertelt@bmw.de, jan.sc.schaefer@bmw.de, ops-xibix@list.bmw.com, omo-xibix@list.bmw.com',
to: 'Andreas.DB.Danzer@bmwgroup.com, michaela.jaeger@bmw.de',
//to: 'Andreas.DB.Danzer@bmwgroup.com',
replyTo: 'coco-apm@bmw.de',
attachmentsPattern: '*.xlsx'

View File

@ -37,41 +37,41 @@ def createHtmlSummary(df):
####################################
####### Between 99 and 100 ##########
####### Between 99,5 and 100 ##########
####################################
SummaryString+='</tr><tr><td style="background-color:Green;">>= 99</td>'
SummaryString+='</tr><tr><td style="background-color:Green;">>= 99.5</td>'
tmp99 = df[(df.evaluatedPercentage >=99) & (df.evaluatedPercentage <= 100)].groupby("HUB")["evaluatedPercentage"].count().reset_index()
tmp99 = df[(df.evaluatedPercentage >=99.5) & (df.evaluatedPercentage <= 100)].groupby("HUB")["evaluatedPercentage"].count().reset_index()
for hub in unique_hub:
#for index, row in tmp99.iterrows():
SummaryString+='<td>{0}</td>'.format(tmp99[(tmp99.HUB == hub)]["evaluatedPercentage"].values[0] if tmp99[(tmp99.HUB == hub)].size != 0 else 0)
SummaryString+='<td><b>{0}</b></td>'.format(len(df[(df.evaluatedPercentage >=99) & (df.evaluatedPercentage <= 100)]))
SummaryString+='<td><b>{0}</b></td>'.format(len(df[(df.evaluatedPercentage >=99.5) & (df.evaluatedPercentage <= 100)]))
####################################
####### Between 98 and 99 ##########
####### Between 99 and 99,5 ##########
####################################
SummaryString+='</tr><tr><td style="background-color:Orange;">>= 98</td>'
SummaryString+='</tr><tr><td style="background-color:Orange;">>= 99.5</td>'
#if tmp98.size != 0:
tmp98 = df[(df.evaluatedPercentage >=98) & (df.evaluatedPercentage < 99)].groupby("HUB")["evaluatedPercentage"].count().reset_index()
tmp98 = df[(df.evaluatedPercentage >=99) & (df.evaluatedPercentage < 99.5)].groupby("HUB")["evaluatedPercentage"].count().reset_index()
for hub in unique_hub:
SummaryString+='<td>{0}</td>'.format(tmp98[(tmp98.HUB == hub)]["evaluatedPercentage"].values[0] if tmp98[(tmp98.HUB == hub)].size != 0 else 0)
SummaryString+='<td><b>{0}</b></td>'.format(len(df[(df.evaluatedPercentage >=98) & (df.evaluatedPercentage < 99)]))
SummaryString+='<td><b>{0}</b></td>'.format(len(df[(df.evaluatedPercentage >=99) & (df.evaluatedPercentage < 99.5)]))
####################################
####### Between 0 and 98 ###########
####### Between 0 and 99 ###########
####################################
SummaryString+='</tr><tr><td style="background-color:Red;">< 98</td>'
SummaryString+='</tr><tr><td style="background-color:Red;">< 99</td>'
tmp0 = df[(df.evaluatedPercentage >=0) & (df.evaluatedPercentage < 98)].groupby("HUB")["evaluatedPercentage"].count().reset_index()
tmp0 = df[(df.evaluatedPercentage >=0) & (df.evaluatedPercentage < 99)].groupby("HUB")["evaluatedPercentage"].count().reset_index()
for hub in unique_hub:
SummaryString+='<td>{0}</td>'.format(tmp0[(tmp0.HUB == hub)]["evaluatedPercentage"].values[0] if tmp0[(tmp0.HUB == hub)].size != 0 else 0)
SummaryString+='<td><b>{0}</b></td>'.format(len(df[(df.evaluatedPercentage >=0) & (df.evaluatedPercentage < 98)]))
SummaryString+='<td><b>{0}</b></td>'.format(len(df[(df.evaluatedPercentage >=0) & (df.evaluatedPercentage < 99)]))
####################################
####### -1 --> N/A ###########
@ -92,4 +92,4 @@ def createHtmlSummary(df):
f.write(SummaryString)
if __name__ == "__main__":
init()
init()