Ver Fonte

obligPI to pandas df

vnc-console há 1 ano atrás
pai
commit
68cb74a126
2 ficheiros alterados com 9 adições e 23 exclusões
  1. 7 3
      tests/test_winmnt.py
  2. 2 20
      winmentor/dbread.py

+ 7 - 3
tests/test_winmnt.py

@@ -2,6 +2,9 @@
 Created on Jan 29, 2020 @author: deeejas
 '''
 import unittest
+
+import pandas as pd
+
 from winmentor import info_anaf
 from winmentor.dbread import WinMentor
 from winmentor.mentorutils import Mentorutils
@@ -32,9 +35,10 @@ class Test(unittest.TestCase):
     
     def test_get_oblig(self):
         head = ['Denumire', 'CF', 'J', 'Adresa', 'Oras', 'Judet', 'Prescurtat', 'Admin', 'AdminP', 'RCNP', 'Obs']
-        firm_list = list(self.mentor.filtered_firmlist(head))
-        
-        print(self.mentor.get_oblig('CHRYPRI/2023_02'))
+        # firm_list = list(self.mentor.filtered_firmlist(head))
+        df_dict = self.mentor.get_oblig('CHRYPRI/2023_02')
+        df = pd.DataFrame(df_dict)
+        print(df.head(10))
         
 
 if __name__ == "__main__":

+ 2 - 20
winmentor/dbread.py

@@ -140,23 +140,6 @@ class WinMentor(object):
                         empl.append(sal.ZileLuk)
                         empl.append(sal.ZileCO)
                         empl_all.append(empl)
-                        # dict_ = {}
-                        # dict_['Cod'] = pers.Cod
-                        # dict_['Nume'] = f'{pers.Nume} {pers.Prenume}'
-                        # dict_['DataAngF'] = pers.DataAngF.strftime('%d-%m-%Y')
-                        # dict_['VenitBrut'] = sal.VenitBrut
-                        # dict_['SalRealizat'] = sal.SalRealizat
-                        # dict_['CO'] = sal.CO
-                        # dict_['SalOra'] = round(sal.SalOra, 2)
-                        # dict_['ContribAngajat'] = sal.ContribAngajat
-                        # dict_['ContribAngajator'] = round(sal.ContribAngajator, 2)
-                        # dict_['VenitNet'] = sal.VenitNet
-                        # dict_['Impozit'] = sal.Impozit
-                        # dict_['SalarNet'] = sal.SalarNet
-                        # dict_['OreLucrate'] = sal.OreLucrate
-                        # dict_['ZileLuk'] = sal.ZileLuk
-                        # dict_['ZileCO'] = sal.ZileCO
-                        # empl.append(dict_)
         return empl_all
 
     def gen_firms(self, db_file, headers) -> list:
@@ -281,7 +264,6 @@ class WinMentor(object):
         short_name = self.winment_path + short_name
         # nbanks = self.update_copy(short_name + '/nbanci.db')
         oblig_db = self.update_copy(short_name + db_file)
-        bank_codes = {}
         with Table(oblig_db) as table: # , Table(nbanks) as nbanks
             all_ = []
             parts = []
@@ -307,8 +289,8 @@ class WinMentor(object):
                     all_.append(values)
                     rests.append(row.Rest)
                     all_.append(rests)
-            df_dict = dict(zip(headers, all_))
-            print(df_dict)
+        df_dict = dict(zip(headers, all_))
+        return df_dict
         
 
     def corp_list(self, name=None):