From e340d1b791df70055d18041f5bac2d1b3943d0a4 Mon Sep 17 00:00:00 2001
From: Juergen Steinhilber <thera-pi@users.sourceforge.net>
Date: Sat, 27 Dec 2014 13:16:44 +0000
Subject: [PATCH] *** empty log message ***

---
 Reha/src/hauptFenster/Reha.java                      |  4 ++--
 Reha/src/org/therapi/reha/patient/Dokumentation.java | 10 ++++++----
 Reha/src/systemEinstellungen/SystemConfig.java       | 13 +++++++++++++
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/Reha/src/hauptFenster/Reha.java b/Reha/src/hauptFenster/Reha.java
index 409a4fc0..05b103c5 100644
--- a/Reha/src/hauptFenster/Reha.java
+++ b/Reha/src/hauptFenster/Reha.java
@@ -314,7 +314,7 @@ public class Reha implements FocusListener,ComponentListener,ContainerListener,M
 	public static boolean demoversion = false;
 	public static boolean vollbetrieb = true;
 
-	public static String aktuelleVersion = "2014-12-16-DB=";
+	public static String aktuelleVersion = "2014-12-27-DB=";
 	
 	public static Vector<Vector<Object>> timerVec = new Vector<Vector<Object>>();
 	public static Timer fangoTimer = null;
@@ -385,7 +385,7 @@ public class Reha implements FocusListener,ComponentListener,ContainerListener,M
 			proghome = homedir+"/RehaVerwaltung/";
 		}
 		
-		//Reha.proghome = "C:/RehaVerwaltung/";
+		Reha.proghome = "C:/RehaVerwaltung/";
 		System.out.println("Programmverzeichnis = "+Reha.proghome);
 		
 		
diff --git a/Reha/src/org/therapi/reha/patient/Dokumentation.java b/Reha/src/org/therapi/reha/patient/Dokumentation.java
index b5da9cf1..b1b5f318 100644
--- a/Reha/src/org/therapi/reha/patient/Dokumentation.java
+++ b/Reha/src/org/therapi/reha/patient/Dokumentation.java
@@ -2002,10 +2002,12 @@ public class Dokumentation extends JXPanel implements ActionListener, TableModel
 				try{
 		//{"Doku-Id","Doku-Art","Titel","erfa�t am","von","",""};
 				//String sstmt = "select * from verordn where PAT_INTERN ='"+xpatint+"' ORDER BY REZ_DATUM";
-				Vector<Vector<String>> vec = SqlInfo.holeSaetze("doku1", 
-						"dokuid,format,dokutitel,DATE_FORMAT(datum,'%d.%m.%Y') AS dokudatum," +
-						"benutzer,pat_intern,id,datei", 
-						"pat_intern='"+xpatint+"' ORDER BY dokuid DESC", Arrays.asList(new String[]{}));
+				String sortmode = (SystemConfig.hmDokuSortMode.get("sortmode").equals("0") ? " dokuid " : " datum ");	
+				String sortasc = (SystemConfig.hmDokuSortMode.get("sortasc").equals("0") ? "DESC" : "ASC");
+				String cmd = "dokuid,format,dokutitel,DATE_FORMAT(datum,'%d.%m.%Y') AS dokudatum," +
+						"benutzer,pat_intern,id,datei";
+				String wherecl = "pat_intern='"+xpatint+"' ORDER BY"+sortmode+sortasc; 
+				Vector<Vector<String>> vec = SqlInfo.holeSaetze("doku1",cmd,wherecl ,Arrays.asList(new String[]{}));
 
 				int anz = vec.size();
 
diff --git a/Reha/src/systemEinstellungen/SystemConfig.java b/Reha/src/systemEinstellungen/SystemConfig.java
index 52589804..2ab7657e 100644
--- a/Reha/src/systemEinstellungen/SystemConfig.java
+++ b/Reha/src/systemEinstellungen/SystemConfig.java
@@ -276,6 +276,7 @@ public class SystemConfig {
 	public static HashMap<String,String> hmHmPosIndex = new HashMap<String,String>();
 	
 	public static Vector <Vector<String>> vOwnDokuTemplate = new Vector <Vector<String>>();
+	public static HashMap<String,String> hmDokuSortMode = new HashMap<String,String>();
 	
 	public static int certState = 0;
 	final public static int certOK = 0;
@@ -1302,6 +1303,7 @@ public class SystemConfig {
 			INIFile inif = INITool.openIni(Reha.proghome+"ini/"+Reha.aktIK+"/", "eigenedoku.ini");
 			String dokus = null;
 			vOwnDokuTemplate.clear();
+			hmDokuSortMode.clear();
 			boolean mustsave = false;
 			// Prüfung auf Existenz
 			if ( (dokus = inif.getStringProperty("EigeneDokus", "DokuAnzahl")) == null ){
@@ -1318,6 +1320,17 @@ public class SystemConfig {
 					vOwnDokuTemplate.add((Vector<String>)vdummy.clone());
 				}
 			}
+			if ( (dokus = inif.getStringProperty("EigeneDokus", "SortByDate")) == null ){
+				inif.setStringProperty("EigeneDokus", "SortByDate","0",null);
+				inif.setStringProperty("EigeneDokus", "SortAsc","0",null);
+				hmDokuSortMode.put("sortmode", "0");
+				hmDokuSortMode.put("sortasc", "0" );
+				
+				mustsave = true;
+			}else{
+				hmDokuSortMode.put("sortmode", inif.getStringProperty("EigeneDokus", "SortByDate") );
+				hmDokuSortMode.put("sortasc", inif.getStringProperty("EigeneDokus", "SortAsc") );
+			}
 			if(mustsave){
 				INITool.saveIni(inif);
 			}
-- 
2.11.4.GIT