From 33e9a9cb5be1228b5eef625288d1787ada1e2b82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C5=BD=C3=A1=C4=8Dek?= Date: Tue, 12 Apr 2022 14:57:40 +0200 Subject: [PATCH 1/7] done_ok --- vdgdsp_final.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/vdgdsp_final.py b/vdgdsp_final.py index b5cb300..1f12cd8 100644 --- a/vdgdsp_final.py +++ b/vdgdsp_final.py @@ -2,7 +2,7 @@ import csv import os import platform import sys -import pandas as pd + from discord_webhook import DiscordWebhook @@ -193,14 +193,8 @@ with open('output_VFGDSP_' + ext_date_from_filaname, 'w', newline='') as csv_fil csv_file4.close() - - -read_file = pd.read_csv (r'output_VFGDSP_202202.CSV') -read_file.to_excel (r'output_VFGDSP_202202.xlsx', index = None, header=True,sheet_name='pocty',) - - -with open("output_VFGDSP_202202.xlsx", "rb") as f: - webhook.add_file(file=f.read(), filename='output_VFGDSP_202202.xlsx') +with open("output_VFGDSP_202202.csv", "rb") as f: + webhook.add_file(file=f.read(), filename='output_VFGDSP_202202.csv') response = webhook.execute() From de8a0538d3adc5d9fd51ebaae6fdf70972cf39d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C5=BD=C3=A1=C4=8Dek?= Date: Tue, 12 Apr 2022 15:54:04 +0200 Subject: [PATCH 2/7] name changed --- vdgdsp_final.py => vfgdsp_final.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename vdgdsp_final.py => vfgdsp_final.py (100%) diff --git a/vdgdsp_final.py b/vfgdsp_final.py similarity index 100% rename from vdgdsp_final.py rename to vfgdsp_final.py From ec8945888dcb04982c89f41b31b982979634d749 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C5=BD=C3=A1=C4=8Dek?= Date: Tue, 12 Apr 2022 16:14:45 +0200 Subject: [PATCH 3/7] had to change delimiter in sim state --- vfgdsp_final.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vfgdsp_final.py b/vfgdsp_final.py index 1f12cd8..766db93 100644 --- a/vfgdsp_final.py +++ b/vfgdsp_final.py @@ -93,7 +93,7 @@ with open(FILE2, newline='', encoding="utf-8") as csvfile2: imsi2 = int(row['IMSI']) iccid2 = int(row['ICCID']) msisdn = int(row['MSISDN']) - simstate = (row['SIM State']) + simstate = (row['SIM_State']) if iccid2 in dict_by_iccid: print("iccid: ", iccid2, " already exists, doing the math") @@ -193,8 +193,8 @@ with open('output_VFGDSP_' + ext_date_from_filaname, 'w', newline='') as csv_fil csv_file4.close() -with open("output_VFGDSP_202202.csv", "rb") as f: - webhook.add_file(file=f.read(), filename='output_VFGDSP_202202.csv') +with open('output_VFGDSP_'+ext_date_from_filaname, "rb") as f: + webhook.add_file(file=f.read(), filename='output_VFGDSP_'+ext_date_from_filaname) response = webhook.execute() From 36a6706a19688bcdac5ae8457133e605bcaaf053 Mon Sep 17 00:00:00 2001 From: jakub Date: Thu, 14 Apr 2022 15:29:51 +0000 Subject: [PATCH 4/7] Update 'vfgdsp_final.py' --- vfgdsp_final.py | 1 + 1 file changed, 1 insertion(+) diff --git a/vfgdsp_final.py b/vfgdsp_final.py index 766db93..871a6d9 100644 --- a/vfgdsp_final.py +++ b/vfgdsp_final.py @@ -5,6 +5,7 @@ import sys from discord_webhook import DiscordWebhook +print(test) webhook = DiscordWebhook( url='https://discordapp.com/api/webhooks/744608404848246926/FwwWUNmuWsCetFDBOcA1trCx6nSflI0yX3f9BNh7-oB5a2VYSLl882di23XK2TNWwQxP', From f4b75c7c001b317f064169c801446780ecce890d Mon Sep 17 00:00:00 2001 From: jakub Date: Thu, 14 Apr 2022 15:30:28 +0000 Subject: [PATCH 5/7] Update 'vfgdsp_final.py' --- vfgdsp_final.py | 1 - 1 file changed, 1 deletion(-) diff --git a/vfgdsp_final.py b/vfgdsp_final.py index 871a6d9..766db93 100644 --- a/vfgdsp_final.py +++ b/vfgdsp_final.py @@ -5,7 +5,6 @@ import sys from discord_webhook import DiscordWebhook -print(test) webhook = DiscordWebhook( url='https://discordapp.com/api/webhooks/744608404848246926/FwwWUNmuWsCetFDBOcA1trCx6nSflI0yX3f9BNh7-oB5a2VYSLl882di23XK2TNWwQxP', From 750099909bf449d273887d84643eb0c85d13b3dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C5=BD=C3=A1=C4=8Dek?= Date: Wed, 11 May 2022 14:03:57 +0200 Subject: [PATCH 6/7] Changed dataprice count --- vfgdsp_final.py | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/vfgdsp_final.py b/vfgdsp_final.py index 766db93..322596e 100644 --- a/vfgdsp_final.py +++ b/vfgdsp_final.py @@ -71,16 +71,28 @@ with open(FILE, newline='', encoding="utf-8") as csvfile: price = price.replace(' ', '') price2 = price - price = (2.23 * float(price)) / 1024 - data = float(price2) / 1024 + + + #price = (2.23 * float(price)) / 1024 + + if float(price) <= 4096: + price = 8 + + else: + price = 8 + (2.23 * float(float(price)-4096)) / 1024 + + + data = (float(price2)/float(1024)) if iccid in dict_by_iccid: dict_by_iccid[iccid].price += price dict_by_iccid[iccid].data += data + print("editing dict for: ", iccid, " price: ", price, " data: ", data) else: + print("price: ",price) dict_by_iccid[iccid] = One(iccid=iccid, imsi=0, msisdn=0, price=price, data=data, smscount=0, smsprice=0, simstatus=None) - print("creating dict for: ", iccid, " price: ", price, " data: ", data) + #print("creating dict for: ", iccid, " price: ", price, " data: ", data) # dict_by_iccid = { iccid1: One(), iccid2:One(), iccid3:One(), } iccid2counter = 0 @@ -93,7 +105,7 @@ with open(FILE2, newline='', encoding="utf-8") as csvfile2: imsi2 = int(row['IMSI']) iccid2 = int(row['ICCID']) msisdn = int(row['MSISDN']) - simstate = (row['SIM_State']) + simstate = (row['SIM State']) if iccid2 in dict_by_iccid: print("iccid: ", iccid2, " already exists, doing the math") From 6ae4bac794d4e9961bf8ecc5722e41594ed01dc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C5=BD=C3=A1=C4=8Dek?= Date: Wed, 11 May 2022 14:33:47 +0200 Subject: [PATCH 7/7] Changed sim_state comma --- vfgdsp_final.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vfgdsp_final.py b/vfgdsp_final.py index 322596e..55914e8 100644 --- a/vfgdsp_final.py +++ b/vfgdsp_final.py @@ -105,7 +105,7 @@ with open(FILE2, newline='', encoding="utf-8") as csvfile2: imsi2 = int(row['IMSI']) iccid2 = int(row['ICCID']) msisdn = int(row['MSISDN']) - simstate = (row['SIM State']) + simstate = (row['SIM_State']) if iccid2 in dict_by_iccid: print("iccid: ", iccid2, " already exists, doing the math")