[22666] Fix translation. Add default statistiken.xml

elexis · Jul 8, 2021 · 668c87c · 668c87c
1 parent de25579
commit 668c87c
Show file tree

Hide file tree

Showing 4 changed files with 82 additions and 15 deletions.
diff --git a/KernFunktionen/Hilfen/Kontexte/ecl_helpers.ctx b/KernFunktionen/Hilfen/Kontexte/ecl_helpers.ctx
@@ -55,10 +55,11 @@ global [ val aWeekAgo [invoke-static  "org.eclipse.rcptt.util"  "java.time.Local
 			invoke plusDays "-7" |
 			invoke format [invoke-static  "org.eclipse.rcptt.util"  "java.time.format.DateTimeFormatter" "ofPattern" "dd.MM.yyyy" ]
 	 ] ]
-concat "today ist " $today " tomorrow " $tomorrow " yesterday: " $yesterday
-	 " aWeekAhead: " $aWeekAhead  " aWeekAgo: " $aWeekAgo | log
+// concat "today ist " $today " tomorrow " $tomorrow " yesterday: " $yesterday
+//	 " aWeekAhead: " $aWeekAhead  " aWeekAgo: " $aWeekAgo | log
 
-concat "user.home: " [get-java-property user.home]  ": getWritableUserDir returns: " [ invoke-static -pluginId ch.elexis.core.data -className ch.elexis.core.data.activator.CoreHub -methodName getWritableUserDir ] | log
+// concat "user.home: " [get-java-property user.home]  ": getWritableUserDir returns: " [ invoke-static -pluginId ch.elexis.core.data
+// className ch.elexis.core.data.activator.CoreHub -methodName getWritableUserDir ] | log
 
 proc "get-user-dir" {
 	if [ get-by-os  -win true -macosx false -linux false ] {
@@ -209,13 +210,13 @@ concat "RCPTT created pdfDir/extern/.localdoc/eHC directories " $pdfDir | log
 
 global [ val preferencesCsvFile [ uri-from-path [ concat  $resultsDir "preferences.csv" ] ] ]
 global [ val viewsCsvFile	    [ uri-from-path [ concat  $resultsDir "views.csv" ] ] ]
-concat "get-env HOME returns: " [get-env HOME ] |log
-concat "resultsDir returns: " $resultsDir |log
-concat "get-default-locale returns: " [get-default-locale] |log
-concat "get-user-dir returns: " [get-user-dir] |log
-concat "user.language returns: " [ get-java-property "user.language" "dummy" ]  |log
+// concat "get-env HOME returns: " [get-env HOME ] |log
+// concat "resultsDir returns: " $resultsDir |log
+// concat "get-default-locale returns: " [get-default-locale] |log
+// concat "get-user-dir returns: " [get-user-dir] |log
+// concat "user.language returns: " [ get-java-property "user.language" "dummy" ]  |log
 global [ val defaultLanguage [ get-java-property "user.language" "de" ] ]
-concat "defaultLanguage is now: " $defaultLanguage| log
+// concat "defaultLanguage is now: " $defaultLanguage| log
 str "Created eHC/input by RCPTT" | write-lines [ concat [get-user-dir] "/elexis/eHC/input/dummy_input.txt" ]
 str "Created eHC/output by RCPTT" | write-lines [ concat [get-user-dir] "/elexis/eHC/output/dummy_output.txt" ]
 
@@ -228,8 +229,6 @@ proc "t" [val key] [val language $defaultLanguage] {
 		bool false
 	}
 }
-t "open" "de" | eq "Öffnen" | verify-true
-t "open" "fr" | eq "Ouvrir" | verify-true
 
 global [ val praxisProperties [ read-properties -uri [concat [get-java-property user.home] "/elexis/rcptt/praxis_" $defaultLanguage ".properties"]]]
 global [ val test_properties  [ read-properties -uri [concat [get-java-property user.home] "/elexis/rcptt/test.properties"]]]

diff --git a/setup/data/statistiken.xml b/setup/data/statistiken.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<queries>
+	<query title="Alle patienten">
+		<from table="Core:Patient" as="pat" />
+		<cols>
+			<col name="id" source="pat.ID" />
+			<col name="alter" source="pat.Alter" />
+			<col name="name" source="pat.Name" />
+			<col name="vorname" source="pat.Vorname" />
+		</cols>
+		<where>
+			<and>
+				<greaterthan a="[alter]" b="30" />
+			</and>
+		</where>
+	</query>
+
+	<query title="Alle status">
+		<from table="Messwert:status" as="stat" />
+		<join table="Core:Patient" as="pat" type="inner">
+			<equal a="[stat.Patient]" b="[pat.ID]" />
+		</join>
+		<cols>
+			<col name="patient" source="stat.patient" />
+			<col name="name"    source="pat.Name" />
+			<col name="vorname" source="pat.Vorname" />
+			<col name="gewicht" source="stat.gewicht" />
+			<col name="groesse" source="stat.groesse" />
+		</cols>
+	</query>
+
+	<query title="Selfjoin">
+		<from table="Core:Patient" as="pat" />
+		<join table="Core:Patient" as="pat2" type="inner">
+			<and>
+				<equal a="[pat.Name]" b="[pat2.Name]" />
+				<lessthan a="[pat.PatCode]" b="[pat2.PatCode]" />
+			</and>
+		</join>
+		<cols>
+			<col name="patient" source="pat.PatCode" />
+			<col name="name" source="pat.Name" />
+			<col name="vn1" source="pat.Vorname" />
+			<col name="vn2" source="pat2.Vorname" />
+		</cols>
+	</query>
+	<query title="Alle Faelle">
+		<from table="Core:Fall" as="fall" />
+		<cols>
+			<col name="nummer" source="fall.FallNummer" />
+			<col name="Bezeichnung"    source="fall.Bezeichnung" />
+			<col name="Grund" source="fall.Grund" />
+			<col name="Datum" source="fall.DatumVon" />
+			<col name="Garant" source="fall.GarantID" />
+		</cols>
+	</query>
+	<query title="Alle Konsultationen">
+		<from table="Core:Konsultation" as="kons" />
+		<cols>
+			<col name="fall" source="kons.FallID" />
+			<col name="datum"    source="kons.Datum" />
+			<col name="eintrag" source="kons.Eintrag" />
+			<col name="kosten" source="kons.Kosten" />
+		</cols>
+	</query>
+
+</queries>
diff --git a/setup/data/translations_de.properties b/setup/data/translations_de.properties
@@ -111,7 +111,7 @@ btn_delete_case=Fall löschen
 btn_diagnosis=Behandlungsdiagnosen
 btn_execute_search=Suche jetzt ausführen
 btn_import=Import...
-btn_reset_perspective=Reset Perspective
+btn_reset_perspective=Reset Perspective|Perspektive zurücksetzen
 btn_services=Leistung.*öffnen
 btn_show_list=Liste anzeigen
 btn_start_perspective=Zur Startperspektive zurückkehren
@@ -177,7 +177,7 @@ fields_MandantKontaktInfoErfassen=Name;Vorname;Geburtsdatum;Strasse;Plz;Ort;Tele
 fields_OrganisationErfassen=Bezeichnung;Zusatz;Ansprechperson;Geburtsdatum;Strasse;Plz;Ort;Telefon;EMail
 global_btn_reset_perspective=Perspektive zurücksetzen
 hinzufuegen=Hinzufügen...
-info_about=Info über.*
+info_about=Info über.*|About.*
 info_configuration=Konfiguration
 info_details=Installationsdetails.*
 info_installed=Install.*Software
@@ -217,7 +217,7 @@ mnu_close_case=Fall schliessen
 mnu_incoice_case=Rechnung erstellen...
 notwendigen_Identifikationsdaten=Bitte geben Sie die notwendigen Identifikationsdaten ein
 ok=OK
-open=Öffnen
+open=Öffnen|Open
 open_window_for_AUF=Ein Fenster mit einer Druckansicht der gew.*ten AUF Öffnen|AUF drucken
 path_remove_all=Alle entfernen
 path_remove_diagnosis=Diagnose entfernen
@@ -246,7 +246,7 @@ select_diagnosis=Diagnose auswählen
 select_roles_right=Gruppen und Rechte/Rollen und Rechte
 select_works_for=tätig für
 show_menu=Menü anzeigen
-show_view=Sicht anzeigen
+show_view=Sicht anzeigen|Show View
 tab_data_kontakte=Kontakte
 tarmed_anrede=Anrede
 tarmed_diag_system=.*System

diff --git a/setup/pom.xml b/setup/pom.xml
@@ -137,6 +137,7 @@
                   <copy file="${project.basedir}/data/Artikelstamm_Short_v5.xml" tofile="${rcptt-resources}/Artikelstamm_Short_v5.xml" preservelastmodified="true" />
                   <copy file="${project.basedir}/data/praxis_de.properties" tofile="${rcptt-resources}/praxis_de.properties" preservelastmodified="true" />
                   <copy file="${project.basedir}/data/praxis_fr.properties" tofile="${rcptt-resources}/praxis_fr.properties" preservelastmodified="true" />
+                  <copy file="${project.basedir}/data/statistiken.xml" tofile="${user.home}/elexis/statistiken.xml" preservelastmodified="true" />
                   <!-- Just to ensure that "${user.home}/elexis/extern getŝ created -->
                   <copy file="${project.basedir}/data/praxis_fr.properties" tofile="${user.home}/elexis/extern/.just_to_create_directory" preservelastmodified="true" />
                   <copy file="${project.basedir}/data/praxis_fr.properties" tofile="${user.home}/elexis/PDF/.just_to_create_directory" preservelastmodified="true" />