Commit bcefa68a authored by Andreas Tille's avatar Andreas Tille
Browse files

New upstream version 22.3

parent d65ebadb
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@
  <body>
    <!-- Primary Index -->
	<p><br><br>Dumped on 2018-05-10</p>
	<p><br><br>Dumped on 2018-08-07</p>
<h1><a name="index">Index of database - gnumed_v22</a></h1>
<ul>
    
+191 −0
Original line number Diff line number Diff line
%------------------------------------------------------------------
% Based on:
%
% Deutsche LaTeX Briefvorlage von Jan-Philip Gehrcke
% http://gehrcke.de -- jgehrcke@googlemail.com
% November 2009, Aktualisierung Januar 2013
%
% Stark angepaßt von Karsten.Hilbert@gmx.net für GNUmed.
%
% use with pdflatex, NOT xelatex
%
% License: GPL v2 or later
%------------------------------------------------------------------

\documentclass[
	paper=a4,
	BCOR=0mm,							% keine BindeCORrektur
	DIN,
	version=last,
	enlargefirstpage=on,
	fontsize=11pt,
	foldmarks=true,
	foldmarks=HP,
	parskip=full,						% Absätze mit Leerzeilen trennen, kein Einzug
	fromurl=false,						% explizit in der Fußzeile
	fromemail=false,					% explizit in der Fußzeile
	fromfax=false,						% explizit in der Fußzeile
	fromphone=false,					% explizit in der Fußzeile
	fromlogo=true,
	fromalign=center,
	fromrule=afteraddress,
	symbolicnames=true,
	headsepline=true,
	footsepline=true,
	pagenumber=footright
]{scrlttr2}
\usepackage{scrlayer-scrpage}			% Kopf- und Fußzeilen
\usepackage[cjkjis,graphics]{ucs}		% lots of UTF8 symbols, breaks with xelatex
\usepackage[utf8x]{inputenc}			% content is UTF8, breaks with xelatex
\usepackage[T1]{fontenc}				% fonts are T1
\usepackage[ngerman]{babel}				% Deutsch und Trennung
\usepackage{marvosym}					% Symbole: Handy, Telefon, E-Mail
\usepackage{textcomp}					% Symbole für Textmodus zum Escapen
\usepackage{lmodern}					% sans serif Latin Modern
\usepackage{longtable}					% Tabellen über mehrere Seiten
\usepackage{tabu}						% bessere Tabellen
\usepackage{graphicx}					% Grafiken laden (Logo und Unterschrift)
\usepackage[space]{grffile}				% besserer Zugriff auf Grafikdateien
\usepackage{lastpage}					% easy access to page number of last page
\usepackage{calc}						% \widthof (für signature)
\usepackage{hyperref}					% aktive URLs


% Definiere Grundschrift: sans serif Latin Modern
\renewcommand*\familydefault{\sfdefault}


\begin{document}


% Kopfzeile ab zweiter Seite
\lehead{$<title::::>$ $<lastname::::>$, $<firstname::::>$ ($<date_of_birth::%d.%B %Y::>$)}
\lohead{$<title::::>$ $<lastname::::>$, $<firstname::::>$ ($<date_of_birth::%d.%B %Y::>$)}
\cehead{}
\cohead{}
\rehead{Seite \thepage/\pageref{LastPage}}
\rohead{Seite \thepage/\pageref{LastPage}}


% Absenderdetails
\setkomavar{fromname}{$<current_provider_name::%(title)s %(firstnames)s %(lastnames)s::>$ $<<if_not_empty::$<current_provider_external_id::Fachgebiet//Ärztekammer::50>$//, FA für %s//::>>$}
\setkomavar{fromaddress}{\small
	$<praxis::%(praxis)s, %(branch)s::120>$ $<<if_not_empty::$<praxis_address::%(street)s::>$//\\//::>>$
	$<praxis_address::%(street)s %(number)s (%(subunit)s), %(postcode)s %(urb)s::60>$
}
\setkomavar{fromlogo}{$<data_snippet::praxis-logo//\includegraphics[width=30mm]{%s}//image/png//.png::250>$}%$ -- this dollarsign unconfuses mcedit syntax coloring
\setkomavar{backaddress}{$<current_provider_firstnames::::1>$.$<current_provider_lastnames::::>$,$<praxis_address::%(street)s %(number)s,%(postcode)s %(urb)s::60>$}


% Geschäftszeile
\setkomavar{yourref}{$<free_text::Angabe unter "Ihr Zeichen"::40>$}
\setkomavar{yourmail}{$<free_text::Angabe unter "Ihr Schreiben vom"::20>$}
\setkomavar{myref}{$<free_text::Angabe unter "Unser Zeichen"::40>$}
\setkomavar{date}{$<today::%d.%B %Y::50>$}
\setkomavar{place}{$<praxis_address::%(urb)s::120>$}


% Betreff, nämlich Patientendaten
\setkomavar{subject}[]{%
	$<<<if_not_empty::$<<free_text::Betreff für den Brief::120>>$//%s\\//::>>>$
	Patient: $<title::::>$ $<firstname::::>$ $<lastname::::>$ (geb $<date_of_birth::%d.%B %Y::>$) $<<if_not_empty::$<adr_street::home::>$//\\//::>>$
	$<<if_not_empty::$<adr_street::home::>$//Adresse: $<adr_street::home::>$ $<adr_number::home::>$, $<adr_postcode::home::>$ $<adr_location::home::>$\\//::>>$
	\begin{itemize}
		\setlength\topsep{0pt}
		\setlength\partopsep{0pt}
		\setlength\itemsep{0pt}
$<diagnoses::		\item %(diagnosis)s::>$
	\end{itemize}
}


% Unterschrift
\setkomavar{signature}{%
	\centering
	$<data_snippet::autograph-$<<current_provider_lastnames::::>>$_$<<current_provider_firstnames::::>>$//\includegraphics[width=30mm]{%s}\\//image/png//.png::250>$\rule{\widthof{\tiny (Der Unterzeichner haftet nicht für unsignierte Änderungen des Inhalts.)}}{.1pt}\\
	$<current_provider_name::%(title)s %(firstnames)s %(lastnames)s::>$\\
	$<<if_not_empty::$<current_provider_external_id::Fachgebiet//Ärztekammer::50>$//FA für %s\\//::>>$
	{\tiny (Der Unterzeichner haftet nicht für unsignierte Änderungen des Inhalts.)}
}
\renewcommand*{\raggedsignature}{\raggedright}
\makeatletter
\@setplength{sigbeforevskip}{1.8cm}							% Definiere vertikalen Abstand vor der Unterschrift
\makeatother


% Fußzeile 1.Seite
\setkomavar{firstfoot}{%
	\rule{\textwidth}{.3pt}
	\parbox[t]{\textwidth}{%
		\tiny
		\begin{tabular}[t]{ll}%
%			\multicolumn{2}{l}{Erreichbarkeit:}\\
			\Telefon       & $<praxis_comm::workphone::60>$\\
			\FAX           & $<praxis_comm::fax::60>$\\
			\Email         & \href{mailto:$<praxis_comm::email::60>$}{$<praxis_comm::email::60>$}\\
			\ComputerMouse & \href{http://$<praxis_comm::web::60>$}{$<praxis_comm::web::60>$}\\
		\end{tabular}%
		\hfill
		\begin{tabular}[t]{ll}%
			\multicolumn{2}{l}{FA für $<current_provider_external_id::Fachgebiet//Ärztekammer::50>$}\\
			BSNR       & $<praxis_id::KV-BSNR//KV//%(value)s::25>$\\
			LANR       & $<current_provider_external_id::KV-LANR//KV::25>$\\
			\multicolumn{2}{l}{GNUmed $<client_version::::>$ (\href{http://www.gnumed.org}{www.gnumed.org})}\\
		\end{tabular}%
		\hfill
		\begin{tabular}[t]{ll}%
			\multicolumn{2}{l}{$<praxis_id::Bankname//Bank//%(value)s::60>$}\\
			IBAN       & $<praxis_id::IBAN//Bank//%(value)s::30>$\\
			BIC        & $<praxis_id::BIC//Bank//%(value)s::30>$\\
			\multicolumn{2}{l}{Vorlage $<form_name_long::::60>$ v$<form_version::::20>$}\\
		\end{tabular}%
	}
}


% Fußzeile ab zweiter Seite
\lefoot{{\tiny $<current_provider::::>$, $<praxis::%(praxis)s: %(branch)s::120>$}}
\lofoot{{\tiny $<current_provider::::>$, $<praxis::%(praxis)s: %(branch)s::120>$}}
\cefoot{}
\cofoot{}
\refoot{{\tiny $<today::%d.%B %Y::50>$}}
\rofoot{{\tiny $<today::%d.%B %Y::50>$}}


% Definiere Brief und Empfaenger
\begin{letter}{%
	$<receiver_name::::>$\\
	$<receiver_street::::>$\ $<receiver_number::::>$\ $<receiver_subunit::::>$\\
	$<receiver_postcode::::>$\ $<receiver_location::::>$\\
	$<receiver_country::::>$
}


% Anrede
\opening{%
	$<<free_text::Anrede, z.B. "Sehr geehrte Frau" (wird automatisch ergänzt durch " $<receiver_name::::>$,")::140>>$ $<receiver_name::::>$,
}


% Brieftext
\selectlanguage{ngerman}
$<<free_text::Der eigentliche Brieftext (in LaTeX)::>>$


\closing{%
	$<<free_text::Grußformel, z.B. "Mit freundlichen Grüßen" (ohne Komma am Ende)::140>>$,
}


% Anlagen
%\setkomavar*{enclseparator}[Anlage(n)]					% Titel für Anlagebereich
$<<<if_not_empty::$<<free_text::Liste von Anlagen::300>>$//\encl{%s}//%\encl{}::>>>$



% kein Verteiler
%\cc{}

\end{letter}

\end{document}
+10 −26
Original line number Diff line number Diff line
@@ -17,35 +17,19 @@ INSERT INTO dem.message_inbox (
) VALUES (
	(select pk from dem.staff where db_user = 'any-doc'),
	(select pk_type from dem.v_inbox_item_type where type = 'memo' and category = 'administrative'),
	'Release Notes for GNUmed 1.7.2 (database v22.2)',
	'GNUmed 1.7.2 Release Notes:
	'Release Notes for GNUmed 1.7.3 (database v22.3)',
	'GNUmed 1.7.3 Release Notes:

	1.7.2
	1.7.3

FIX: GTK3 related size adjustments for PatientOverview/SimpleSoap plugins
FIX: GTK3 related bitmap adjustments
FIX: [Save] functionality of Export Area
FIX: placeholders $current_provider_[title/firstnames/lastnames]$
FIX: receiver selection address list setup
FIX: exception on creation of duplicate patient [thanks Marc]
FIX: failure to merge patients under some conditions [thanks Marc]
FIX: exception on creating person duplicates
FIX: failure to delete inbox messages w/o a receiver
FIX: handling of single_selection in generic list selection [thanks Scott Talbert]
FIX: setting of initial size of main frame [thanks Tim Roberts]

	1.7.1

NEW: add bash completion script

IMPROVED: make DWV optional
IMPROVED: prerequisites check tool
IMPROVED: update timeline code to 1.17.0 release

	22.2

FIX: staff/v_staff plausibility check [thanks Marc]
FIX: LaTeX-Template for Begleitbrief

	22.1

IMPROVED: concurrency robustness of backup/restore scripts
IMPROVED: robustify tarballing script against network flukes
');

-- --------------------------------------------------------------
select gm.log_script_insertion('v22-release_notes-fixup.sql', '22.2');
select gm.log_script_insertion('v22-release_notes-fixup.sql', '22.3');