Skip to content

Commit d599987

Browse files
committed
Classe Lavoratore modificata
1 parent c4e0847 commit d599987

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

persona.py

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
from abc import ABCMeta, abstractmethod
2+
import logging
23

3-
4-
from abc import ABCMeta
4+
logging.basicConfig(filename = 'log_es_persona.log' ,format=' %(levelname)s %(asctime) s %(message)s',level=logging.DEBUG)
5+
logger = logging.getLogger(__name__)
56

67
class Persona(metaclass=ABCMeta):
78
def __init__(self,nome, cognome, data_nascita):
@@ -46,8 +47,7 @@ class Lavoratore(Persona, metaclass=ABCMeta):
4647

4748
def __init__(self,nome, cognome, data_nascita, idbadge, mansione):
4849
super().__init__(nome, cognome, data_nascita)
49-
if (len(idbadge) != 8) or (idbadge.isalnum() == False):
50-
raise ValueError('Inserire un IBAN valido.')
50+
Lavoratore.check_id(idbadge)
5151
self._idbadge = idbadge
5252
self._mansione = mansione
5353
logger.info("E' stato inserito un lavoratore.")
@@ -68,10 +68,8 @@ def get_idbadge(self):
6868
return self._idbadge
6969

7070
def set_idbadge(self, x):
71-
if (len(x)<0) or (len(x)>8) or (x.isalnum() == False):
72-
raise('Inserisci un id valido')
73-
else:
74-
self._idbadge = x
71+
Lavoratore.check_id(x)
72+
self._idbadge = x
7573

7674
def get_masnione(self):
7775
return self._mansione
@@ -81,6 +79,14 @@ def set_mansione(self, x):
8179
raise('Inserisci una mansione valida')
8280
else:
8381
self._mansione = x
82+
83+
@staticmethod
84+
def check_id(idbadge):
85+
if (len(idbadge)<0) or (len(idbadge)>8) or (idbadge.isalnum() == False):
86+
raise('Inserisci una id valido.')
87+
else:
88+
pass
89+
8490

8591
@abstractmethod
8692
def stipendio(self):

0 commit comments

Comments
 (0)