Merge remote-tracking branch 'origin/master'

This commit is contained in:
2025-10-13 13:36:50 +02:00
2 changed files with 31 additions and 30 deletions

View File

@@ -43,7 +43,7 @@ def get_medicus_connection():
return fdb.connect(dsn=r"localhost:m:\medicus\data\medicus.fdb", user="SYSDBA", password="masterkey", charset="win1250")
elif computer_name in ("SESTRA", "POHODA"):
print("Computer name is SESTRA or POHODA")
return fdb.connect(dsn=r"192.168.1.40:m:\medicus\data\medicus.fdb", user="SYSDBA", password="masterkey", charset="win1250")
return fdb.connect(dsn=r"192.168.1.10:m:\medicus\data\medicus.fdb", user="SYSDBA", password="masterkey", charset="win1250")
else:
raise RuntimeError(f"❌ Unknown computer name: {computer_name}")

View File

@@ -25,33 +25,34 @@ cesta=dropbox/"Ordinace"/"Dokumentace_ke_zpracování"
cestazpracovana=dropbox/"Ordinace"/"Dokumentace_zpracovaná"
for file in os.listdir(cesta):
if file.upper().endswith((".PDF")) and os.path.isfile(os.path.join(cesta,file)):
pattern=r"^(\d{9,10}) ((?:(?:19|20)\d\d)-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])) (\[.*)"
nalezeno=re.search(pattern,file)
if nalezeno:
print(nalezeno.groups())
x=nalezeno.groups()
rodcis=nalezeno.group(1)
datum=nalezeno.group(2)
konec=nalezeno.group(5)
print(datum)
print(konec)
print(rodcis,type(rodcis))
cur = conn.cursor()
cur.execute("select prijmeni, jmeno from kar where rodcis=?",(rodcis,))
x = cur.fetchone()
if x:
if len(x[0].split(" "))==1:
prijmeni=x[0]
else:
prijmeni=x[0].split(" ")[0]
if len(x[1].split(" "))==1:
jmeno=x[1]
else:
prijmeni=x[1].split(" ")[0]
konecsouboru=file.split(rodcis)[1]
novejmeno=rodcis+" "+datum+" "+prijmeni.strip()+", "+jmeno.strip()+" "+konec
print(novejmeno)
os.rename(os.path.join(cesta,file),os.path.join(cesta,novejmeno))
cur.close()
if os.path.isfile(os.path.join(cesta, file)):
if file.upper().endswith((".PDF")) and os.path.isfile(os.path.join(cesta,file)):
pattern=r"^(\d{9,10}) ((?:(?:19|20)\d\d)-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])) (\[.*)"
nalezeno=re.search(pattern,file)
if nalezeno:
print(nalezeno.groups())
x=nalezeno.groups()
rodcis=nalezeno.group(1)
datum=nalezeno.group(2)
konec=nalezeno.group(5)
print(datum)
print(konec)
print(rodcis,type(rodcis))
cur = conn.cursor()
cur.execute("select prijmeni, jmeno from kar where rodcis=?",(rodcis,))
x = cur.fetchone()
if x:
if len(x[0].split(" "))==1:
prijmeni=x[0]
else:
prijmeni=x[0].split(" ")[0]
if len(x[1].split(" "))==1:
jmeno=x[1]
else:
prijmeni=x[1].split(" ")[0]
konecsouboru=file.split(rodcis)[1]
novejmeno=rodcis+" "+datum+" "+prijmeni.strip()+", "+jmeno.strip()+" "+konec
print(novejmeno)
os.rename(os.path.join(cesta,file),os.path.join(cesta,novejmeno))
cur.close()