Parcourir la source

created modules

vnc-console il y a 4 mois
Parent
commit
1e2ac9d4f9

+ 3 - 0
py_mentor_imports/__init__.py

@@ -1 +1,4 @@
 '''Created on 13 May 2024 @author: vnc-console'''
+
+from .monetars import Monetar
+from .utils import (convert_date_format, get_last_month)

+ 8 - 0
py_mentor_imports/monetars.py

@@ -0,0 +1,8 @@
+'''Created on 14 May 2024 @author: vnc-console'''
+
+class Monetar(object):
+    def __init__(self, zi_fiscala, data_raport_z, numar_bonuri, value):
+        self.zi_fiscala = zi_fiscala
+        self.data_raport_z = data_raport_z
+        self.numar_bonuri = numar_bonuri
+        self.value = value

+ 16 - 0
py_mentor_imports/utils.py

@@ -0,0 +1,16 @@
+'''Created on 14 May 2024 @author: vnc-console'''
+
+import datetime
+
+def convert_date_format(date_string):
+    # Convert datetime object to desired format
+    new_date_string = date_string.strftime("%d.%m.%Y")
+    return new_date_string
+
+def get_last_month(day):
+    today = datetime.date.today()
+    first_day_of_this_month = datetime.date(today.year, today.month, 1)
+    last_day_of_last_month = first_day_of_this_month - datetime.timedelta(days=day)
+    # last_month = last_day_of_last_month.strftime('%B %Y')
+    last_month = last_day_of_last_month.month
+    return last_month

+ 3 - 24
tests/test_monet_import.py

@@ -6,32 +6,15 @@ import datetime
 import pandas as pd
 from jinja2 import (Environment, PackageLoader)
 
+from py_mentor_imports import (Monetar, convert_date_format, get_last_month)
+
 
 class Test(unittest.TestCase):
 
     templates = Environment(loader=PackageLoader('py_mentor_imports', 'templates'))
     template = templates.get_template('monetars.txt')
 
-    class Monetar(object):
-        def __init__(self, zi_fiscala, data_raport_z, numar_bonuri, value):
-            self.zi_fiscala = zi_fiscala
-            self.data_raport_z = data_raport_z
-            self.numar_bonuri = numar_bonuri
-            self.value = value
-
     def test_monet(self):
-        def convert_date_format(date_string):
-            # Convert datetime object to desired format
-            new_date_string = date_string.strftime("%d.%m.%Y")
-            return new_date_string
-
-        def get_last_month(day):
-            today = datetime.date.today()
-            first_day_of_this_month = datetime.date(today.year, today.month, 1)
-            last_day_of_last_month = first_day_of_this_month - datetime.timedelta(days=day)
-            # last_month = last_day_of_last_month.strftime('%B %Y')
-            last_month = last_day_of_last_month.month
-            return last_month
         path = r'f:\Gdrive\Misc\Dosar-Contabilitate\Ridewave\2024_04\raport_z\20240507213946_from_010424_to_300424__from_5_to_29.xlsx'
         df = pd.read_excel(path)
         df = df.drop(['Unnamed: 1', 'Unnamed: 2', 'Unnamed: 3',
@@ -41,12 +24,8 @@ class Test(unittest.TestCase):
         # print(df['4. Data raport Z'])
         monetars = []
         for zi, date, number, value in zip(df['1. Zi fiscala'], df['4. Data raport Z'], df['5. Numar\nbonuri'], df['6. Valoare\ntotala']):
-            monetar = self.Monetar(zi_fiscala=zi, data_raport_z=date, numar_bonuri=number, value=value)
+            monetar = Monetar(zi_fiscala=zi, data_raport_z=date, numar_bonuri=number, value=value)
             monetars.append(monetar)
-        # print(monetars[24].data_raport_z)
-        # print(df['5. Numar\nbonuri'][24])
-        # print(df.columns)
-        # print(len(df))
 
         data = {'AnLucru': datetime.date.today().year,
                 'LunaLucru': get_last_month(1),