IFPass.py

@@ -23,7 +23,7 @@ from colorama import init
 from termcolor import colored
 
 
-version = '3.2'  # dev/devnocam
+version = '3.0'  # dev/devnocam
 
 configdir = os.path.join(os.getenv('PROGRAMDATA'), 'IFPass')
 config = os.path.join(configdir, 'IFPass.conf')
@@ -248,7 +248,7 @@ def bkpdb():
 
 
 def fillcard(clientID, titrename, firstname, dateexp, barcode, picture):
-    print("Création du verso de la carte avec les informations...", end='')
+    print("Création de la carte avec les informations...", end='')
     try:
         im = Image.open(pngtemplate)
     except FileNotFoundError:
@@ -287,7 +287,6 @@ def fillcard(clientID, titrename, firstname, dateexp, barcode, picture):
 
 
 def mergepdf(clientID):
-    print("Fusion du recto et du verso de la carte...", end='')
     cartefilename = os.path.join(imgdir, clientID + '.pdf')
     output = PdfFileWriter()
 
@@ -303,7 +302,6 @@ def mergepdf(clientID):
         output.write(f)
 
     os.remove(imgdir + clientID + '_Front.pdf')
-    print(colored('[OK]', 'green'))
 
     return cartefilename
 
@@ -313,17 +311,6 @@ def printcard(cartefilename):
     subprocess.Popen('"' + AcrobatReader + '"' + ' /h /n /t ' + cartefilename + ' ' + printername, shell=False)
 
 
-def getdateexp():
-    while True:
-        dateexp = input("Quelle date d'expiration voulez-vous mettre (Format : JJ/MM/AAAA)? : ")
-        match = re.fullmatch(r'^(0[1-9]|1[0-9]|2[0-9]|3[0-1])/(0[1-9]|1[0-2])/([0-9]){4}$', dateexp)
-        if match:
-            break
-        else:
-            print('Mauvais format ! JJ/MM/AAAA, exemple : 01/08/2042')
-    return dateexp
-
-
 def newmember():
     while "the informations are incorrect":              # Loop Filling informations
         os.system('cls')
@@ -335,7 +322,13 @@ def newmember():
         dateexp = dateexp.strftime('%d/%m/%Y')
         changeexp = yes_or_no("Voulez-vous choisir la date d'expiration ?")
         if changeexp:
-            dateexp = getdateexp()
+            while True:
+                dateexp = input("Quelle date d'expiration voulez-vous mettre (Format : JJ/MM/AAAA)? : ")
+                match = re.fullmatch(r'^(0[1-9]|1[0-9]|2[0-9]|3[0-1])/(0[1-9]|1[0-2])/([0-9]){4}$', dateexp)
+                if match:
+                    break
+                else:
+                    print('Mauvais format ! JJ/MM/AAAA, exemple : 01/08/2042')
 
         os.system('cls')
         print("Titre :             ", colored(titre, 'green'))
@@ -407,11 +400,11 @@ def membersearch():
             if diff > 0:
                 print(colored(f"L'abonnement est encore valable {diff} jours.", 'green', attrs=['bold']))
             elif diff < 0:
-                print(colored(f"L'abonnement est expiré depuis {abs(diff)} jours.", 'red', attrs=['bold']))  # abs() to remove minus sign
+                print(colored("L'abonnement est expiré depuis {abs(diff)} jours.", 'red', attrs=['bold']))  # abs() to remove minus sign
             elif diff == 0:
                 print(colored("Il s'agit du dernier jour de l'abonnement, il expirera demain.", 'yellow', attrs=['bold']))
 
-            print('\n1 - Modifier', "2 - Renouveller l'abonnement / Choisir un nouvelle date d'expiration", '3 - Imprimer la carte', '0 - Menu principal', sep='\n')
+            print('\n1 - Modifier', "2 - Renouveller l'abonnement", '3 - Imprimer la carte', '0 - Menu principal', sep='\n')
             choix = input('Choix : ')
             if choix == '0':
                 os.system('cls')
@@ -438,17 +431,13 @@ def memberdo(choix, member):
         titre, firstname, surname, dateexp = memberedit(titre, firstname, surname, clientID, dateinsc, dateexp)
 
     elif choix == '2':  # Renew subscription
-        changeexp = yes_or_no("Voulez-vous choisir la date d'expiration ?")
+        dateexp = datetime.strptime(dateexp, '%d/%m/%Y').date()
-        if changeexp:
+        diff = (dateexp - date.today()).days
-            dateexp = getdateexp()
+        if diff >= 0:
-        else:
+            dateexp = dateexp + timedelta(days=365)
-            dateexp = datetime.strptime(dateexp, '%d/%m/%Y').date()
+        elif diff < 0:
-            diff = (dateexp - date.today()).days
+            dateexp = date.today() + timedelta(days=365)
-            if diff >= 0:
+        dateexp = dateexp.strftime('%d/%m/%Y')
-                dateexp = dateexp + timedelta(days=365)
-            elif diff < 0:
-                dateexp = date.today() + timedelta(days=365)
-            dateexp = dateexp.strftime('%d/%m/%Y')
 
         if titre == 'Dr.':
             titrename = titre + ' ' + surname
@@ -483,7 +472,6 @@ def memberdo(choix, member):
         print(colored("La date d'expiration a bien été mise à jour !\n", 'blue', attrs=['bold']))
 
     elif choix == '3':  # Print card
-        cartefilename = os.path.join(imgdir, clientID + '.pdf')
         printcard(cartefilename)
     else:
         print(colored('Choix incorrect !\n', 'red', attrs=['bold']))
@@ -544,7 +532,6 @@ def main():
         if version in ('dev', 'devnocam'):
             print(colored("\nATTENTION : Il s'agit d'une version en cours de développement, potentiellement instable !", 'red'))
         print("\nCe programme est developpé par par Jordan ERNST pour l'Institut Français en Hongrie.")
-        print("Il est disponible sou licence MIT à cette addresse : https://framagit.org/SecT0uch/IFPass\n")
         print('Pour toute question, problème ou requête contactez-moi à pro.ernst@gmail.com.\n')
         print('1 - Nouveau membre', '2 - Rechercher un membre', '0 - Quitter', sep='\n')
         choix = input('Choix : ')

README.md

@@ -1,12 +1,4 @@
 # IFPass
 
-IFPass is a python project developped for the "Institut Français en Hongrie" and published under [MIT license](https://framagit.org/SecT0uch/IFPass/blob/master/LICENSE).  
+IFPass is a python project developped for the "Institut Français en Hongrie" and published under MIT license.  
 It allows to manage a subscriber database and print member cards.
-
-## Build
-
-1. Install [NSIS](http://nsis.sourceforge.net/Download).
-2. Install python 3 and pip.
-3. Install the modules with `sudo -H pip install pynsist PyPDF2 termcolor`
-4. If pynsist version < 2.4, replace `/usr/lib/python3.*/site-packages/nsist/__init__.py` with https://raw.githubusercontent.com/takluyver/pynsist/master/nsist/__init__.py
-5. Run `./build.sh`

installer-x64.cfg

@@ -1,43 +1,31 @@
 [Application]
 name=IFPass
-version=3.2
+version=3.0
 entry_point=IFPass:main
 icon=IF.ico
 console=true
 license_file=LICENSE
 
 [Python]
-version=3.7.3
+version=3.7.1
 bitness=64
 
 [Include]
 # Packages from PyPI that your application requires, one per line
 # These must have wheels on PyPI:
-# https://pypi.org/project/code128/
-# https://pypi.org/project/colorama/
-# https://pypi.org/project/pyfiglet/
-# https://pypi.org/project/numpy/
-# https://pypi.org/project/opencv-python/
-# https://pypi.org/project/Pillow/
-# https://pypi.org/project/pywin32/
-# https://pypi.org/project/six/
-# https://pypi.org/project/setuptools/
-# https://pypi.org/project/PyMuPDF/
-# https://pypi.org/project/pywinauto/
-
 pypi_wheels=code128==0.3
     colorama==0.4.1
     pyfiglet==0.8.post1
-    numpy==1.16.4
+    numpy==1.16.2
-    opencv-python==4.1.0.25
+    opencv-python==4.0.0.21
-    Pillow==6.0.0
+    Pillow==5.4.1
     pywin32==224
     six==1.12.0
-    setuptools==41.0.1
+    setuptools==40.8.0
-    PyMuPDF==1.14.16
+    PyMuPDF==1.14.8
     pywinauto==0.6.6
-
 # Must check if future updates of the following packages provide .whl files
+# pywinauto needs to be downloaded manually and edit setup to match  platform=win32
 # Packages without wheels (Must be installed locally):
 packages=PyPDF2
     termcolor

installer-x86.cfg

@@ -1,43 +1,31 @@
 [Application]
 name=IFPass
-version=3.2
+version=3.0
 entry_point=IFPass:main
 icon=IF.ico
 console=true
 license_file=LICENSE
 
 [Python]
-version=3.7.3
+version=3.7.1
 bitness=32
 
 [Include]
 # Packages from PyPI that your application requires, one per line
 # These must have wheels on PyPI:
-# https://pypi.org/project/code128/
-# https://pypi.org/project/colorama/
-# https://pypi.org/project/pyfiglet/
-# https://pypi.org/project/numpy/
-# https://pypi.org/project/opencv-python/
-# https://pypi.org/project/Pillow/
-# https://pypi.org/project/pywin32/
-# https://pypi.org/project/six/
-# https://pypi.org/project/setuptools/
-# https://pypi.org/project/PyMuPDF/
-# https://pypi.org/project/pywinauto/
-
 pypi_wheels=code128==0.3
     colorama==0.4.1
     pyfiglet==0.8.post1
-    numpy==1.16.4
+    numpy==1.16.2
-    opencv-python==4.1.0.25
+    opencv-python==4.0.0.21
-    Pillow==6.0.0
+    Pillow==5.4.1
     pywin32==224
     six==1.12.0
-    setuptools==41.0.1
+    setuptools==40.8.0
-    PyMuPDF==1.14.16
+    PyMuPDF==1.14.8
     pywinauto==0.6.6
-
 # Must check if future updates of the following packages provide .whl files
+# pywinauto needs to be downloaded manually and edit setup to match  platform=win32
 # Packages without wheels (Must be installed locally):
 packages=PyPDF2
     termcolor