From fb81e1b3a8470f229ff9892858e5ce74abb8a726 Mon Sep 17 00:00:00 2001
From: Christian Paminger <pam@technikum-wien.at>
Date: Mon, 2 Jul 2007 08:05:22 +0000
Subject: [PATCH]

---
 .../imexport/zutrittskarten/export.php        | 81 ++++++++++---------
 1 file changed, 42 insertions(+), 39 deletions(-)

diff --git a/vilesci/stammdaten/imexport/zutrittskarten/export.php b/vilesci/stammdaten/imexport/zutrittskarten/export.php
index 7f710bc74..ce943a7ac 100644
--- a/vilesci/stammdaten/imexport/zutrittskarten/export.php
+++ b/vilesci/stammdaten/imexport/zutrittskarten/export.php
@@ -18,12 +18,15 @@ if (!$conn=pg_pconnect(CONN_STRING))
 	die(pg_last_error($conn));
 
 // Neue Zutrittskarten
-$sql_query="SELECT *, EXTRACT(DAY FROM insertamum) AS tag, " .
-					"EXTRACT(MONTH FROM insertamum) AS monat, " .
-					"EXTRACT(YEAR FROM insertamum) AS jahr " .
-			"FROM public.vw_betriebsmittelperson " .
-			"WHERE betriebsmitteltyp='Zutrittskarte' AND nummer NOT IN " .
-				"( SELECT physaswnumber FROM sync.tbl_zutrittskarte);";
+$sql_query='SELECT student_uid, matrikelnr, kurzbzlang AS stg_kurzbzlang,vw_betriebsmittelperson.*,
+				EXTRACT(DAY FROM vw_betriebsmittelperson.insertamum) AS tag,
+				EXTRACT(MONTH FROM vw_betriebsmittelperson.insertamum) AS monat,
+				EXTRACT(YEAR FROM vw_betriebsmittelperson.insertamum) AS jahr
+			FROM public.vw_betriebsmittelperson
+				LEFT OUTER JOIN (public.tbl_benutzer JOIN public.tbl_student ON (uid=student_uid)
+					JOIN public.tbl_studiengang USING (studiengang_kz))
+				USING (person_id)
+			WHERE betriebsmitteltyp='Zutrittskarte' AND nummer NOT IN (SELECT physaswnumber FROM sync.tbl_zutrittskarte);';
 //echo $sql_query;
 if(!$result_neu=pg_exec($conn, $sql_query))
 	die(pg_errormessage().'<BR>'.$sql_query);
@@ -47,23 +50,23 @@ $worksheet =& $workbook->addWorksheet("CerpassZutrittskartenUpdate");
 // let's merge
 //$format_title->setAlign('merge');
 
-$worksheet->write(0,0,"(Command)"); //, $format_bold
-$worksheet->write(0,1,"(Key)");
+$worksheet->write(0,0,"(Command)"); 	// a:Add - u:Update - d:Delete
+$worksheet->write(0,1,"(Key)");			// Gleich wie LogAswNumber
 $worksheet->write(0,2,"(Name)");
 $worksheet->write(0,3,"(FirstName)");
-$worksheet->write(0,4,"(Group)");
-$worksheet->write(0,5,"(LogAswNumber)");
-$worksheet->write(0,6,"(PhysAswNumber)");
-$worksheet->write(0,7,"(ValidStart)");
-$worksheet->write(0,8,"(ValidEnd)");
-$worksheet->write(0,9,"(UID)");
-$worksheet->write(0,10,"(Matrikelnummer)");
-$worksheet->write(0,11,"(Kurzbezeichnung)");
-$worksheet->write(0,12,"(Semester)");
-$worksheet->write(0,13,"(Text5)");
-$worksheet->write(0,14,"(Titel)");
-$worksheet->write(0,15,"(PIN)");
-$worksheet->write(0,16,"(CardState)");
+$worksheet->write(0,4,"(Group)");				// Muss auf Anlage vorhanden sein Studenten: StudiengangskennzahlLang Mitarbeiter: Verwaltung/General
+$worksheet->write(0,5,"(LogAswNumber)");		// Betriebsmittel: LogNummer
+$worksheet->write(0,6,"(PhysAswNumber)");		// Betriebsmittel: Nummer
+$worksheet->write(0,7,"(ValidStart)");			// aktuell
+$worksheet->write(0,8,"(ValidEnd)");			// +5 Jahre
+$worksheet->write(0,9,"(UID)");					//Text1:
+$worksheet->write(0,10,"(Matrikelnummer)"); 	//Text2: Wichtig bei Studenten
+$worksheet->write(0,11,"(Text3)");	//Text3: Nicht verwenden
+$worksheet->write(0,12,"(Text4)");			//Text4: Nicht verwenden
+$worksheet->write(0,13,"(Text5)");				//Text5:
+$worksheet->write(0,14,"(Text6)");				//Text6:
+$worksheet->write(0,15,"(PIN)");		// Nicht verwenden
+$worksheet->write(0,16,"(CardState)");	// Bei Neuen immer auf 0
 
 // set width of columns
 $worksheet->setColumn(0,0,2); // erste Spalte auf width=2
@@ -76,24 +79,24 @@ $z=1; // Start bei Zeile 1
 while ($row=pg_fetch_object($result_neu))
 {
 	$command='a';
-	$worksheet->write($z,0, utf8_decode($command));
-	$worksheet->write($z,1, utf8_decode($row->person_id));
-	$worksheet->write($z,2, utf8_decode($row->nachname));
-	$worksheet->write($z,3, utf8_decode($row->vorname));
-	$worksheet->write($z,4, utf8_decode(substr($row->uid,0,5)));
-	$worksheet->write($z,5, utf8_decode($row->person_id));
-	$worksheet->write($z,6, utf8_decode($row->nummer));
-	$worksheet->write($z,7, utf8_decode($row->tag.'.'.$row->monat.'.'.$row->jahr));
-	$worksheet->write($z,8, utf8_decode($row->tag.'.'.$row->monat.'.'.($row->jahr+4)));
-	$worksheet->write($z,9, utf8_decode($row->uid));
-	$worksheet->write($z,10, utf8_decode($row->svnr));
-	$worksheet->write($z,11, utf8_decode('Kurzbz'));
-	$worksheet->write($z,12, utf8_decode('Semester'));
-	$worksheet->write($z,13, utf8_decode('Text5'));
-	$worksheet->write($z,14, utf8_decode($row->titelpre));
-	$worksheet->write($z,15, utf8_decode('PIN'));
-	$worksheet->write($z,16, utf8_decode('CardState'));
-	$z++;		
+	$worksheet->write($z,0, $command);
+	$worksheet->write($z,1, $row->nummerintern);
+	$worksheet->write($z,2, $row->nachname);
+	$worksheet->write($z,3, $row->vorname);
+	$worksheet->write($z,4, $row->matrikelnr);
+	$worksheet->write($z,5, $row->nummerintern);
+	$worksheet->write($z,6, $row->nummer);
+	$worksheet->write($z,7, $row->tag.'.'.$row->monat.'.'.$row->jahr);
+	$worksheet->write($z,8, $row->tag.'.'.$row->monat.'.'.($row->jahr+5));
+	$worksheet->write($z,9, $row->uid);
+	$worksheet->write($z,10,$row->matrikelnr);
+	$worksheet->write($z,11,'');
+	$worksheet->write($z,12,'');
+	$worksheet->write($z,13,'');
+	$worksheet->write($z,14,'');
+	$worksheet->write($z,15,'');
+	$worksheet->write($z,16,'0');
+	$z++;
 }
 
 $workbook->close();