blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-23 09:52:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Rudolf Hangl
2007-03-08 12:58:32 +00:00
parent f3fc145819
commit 1ab3b6b318
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/fas/check_fas_person.php
+6 -6
View File
@@ -242,12 +242,12 @@ p2.staatsbuergerschaft as staatsbuergerschaft2, p2.familienstand as familienstan
p2.anzahlderkinder as anzahlderkinder2, p2.ersatzkennzeichen as ersatzkennzeichen2, p2.bemerkung as bemerkung2, p2.titel as titel2,
p2.uid as uid2, p2.gebnation as gebnation2, p2.postnomentitel as postnomentitel2, p2.bismelden as bismelden2
FROM person p1, person p2 WHERE p1.person_pk<p2.person_pk AND p1.svnr=p2.svnr AND p1.svnr IS NOT NULL
AND p1.svnr!='0005010400' AND p1.svnr!=''
AND (p1.familienname!=p2.familienname OR p1.vorname!=p2.vorname OR p1.anrede!=p2.anrede OR p1.vornamen!=p2.vornamen
OR p1.geschlecht!=p2.geschlecht OR p1.gebdat!=p2.gebdat OR p1.gebort!=p2.gebort OR p1.staatsbuergerschaft!=p2.staatsbuergerschaft
OR p1.familienstand!=p2.familienstand OR p1.svnr!=p2.svnr OR p1.anzahlderkinder!=p2.anzahlderkinder
OR p1.ersatzkennzeichen!=p2.ersatzkennzeichen OR p1.titel!=p2.titel OR p1.gebnation!=p2.gebnation
OR p1.postnomentitel!=p2.postnomentitel) ORDER BY p1.familienname, p1.person_pk;";
AND p1.svnr<>'0005010400' AND p1.svnr<>''
AND (p1.familienname<>p2.familienname OR p1.vorname<>p2.vorname OR p1.anrede<>p2.anrede OR p1.vornamen<>p2.vornamen
OR p1.geschlecht<>p2.geschlecht OR p1.gebdat<>p2.gebdat OR p1.gebort<>p2.gebort OR p1.staatsbuergerschaft<>p2.staatsbuergerschaft
OR p1.familienstand<>p2.familienstand OR p1.svnr<>p2.svnr OR p1.anzahlderkinder<>p2.anzahlderkinder
OR p1.ersatzkennzeichen<>p2.ersatzkennzeichen OR p1.titel<>p2.titel OR p1.gebnation<>p2.gebnation
OR p1.postnomentitel<>p2.postnomentitel) ORDER BY p1.familienname, p1.person_pk;";
if($result = pg_query($conn_fas, $qry))
{
admin/sync/fas/sync_fas_vilesci_mitarbeiter.php
+1 -1
View File
@@ -302,7 +302,7 @@ FROM (person JOIN mitarbeiter ON person_pk=mitarbeiter.person_fk ) AS p1
CROSS JOIN (person JOIN mitarbeiter ON person_pk=mitarbeiter.person_fk) AS p2 WHERE
((p1.gebdat=p2.gebdat AND p1.familienname=p2.familienname AND p1.svnr='' AND p1.ersatzkennzeichen='')
OR ((p1.ersatzkennzeichen=p2.ersatzkennzeichen AND p1.ersatzkennzeichen<>'') OR (p1.svnr=p2.svnr AND p1.svnr<>'')))
AND (p1.person_pk < p2.person_pk)
AND (p1.person_pk <> p2.person_pk)
AND (p1.familienname<>p2.familienname OR p1.vorname<>p2.vorname OR p1.vornamen<>p2.vornamen OR p1.geschlecht<>p2.geschlecht OR p1.gebdat<>p2.gebdat OR p1.staatsbuergerschaft<> p2.staatsbuergerschaft OR p1.familienstand<>p2.familienstAND OR p1.svnr<>p2.svnr OR p1.ersatzkennzeichen<>p2.ersatzkennzeichen OR p1.anrede<>p2.anrede OR p1.anzahlderkinder<>p2.anzahlderkinder OR p1.bismelden<>p2.bismelden OR p1.titel<>p2.titel OR p1.gebnation<>p2.gebnation OR p1.postnomentitel<> p2.postnomentitel
OR p1.beginndatum<>p2.beginndatum OR p1.akadgrad<>p2.akadgrad OR p1.habilitation<>p2.habilitation OR p1.mitgliedentwicklungsteam<>p2.mitgliedentwicklungsteam OR p1.qualifikation<>p2.qualifikation OR p1.hauptberuflich<>p2.hauptberuflich OR p1.hauptberuf<>p2.hauptberuf OR p1.semesterwochenstunden<>p2.semesterwochenstunden OR p1.persnr<>p2.persnr OR p1.beendigungsdatum<>p2.beendigungsdatum OR p1.ausgeschieden<>p2.ausgeschieden OR p1.kurzbez<>p2.kurzbez OR p1.stundensatz<>p2.stundensatz OR p1.ausbildung<>p2.ausbildung OR p1.aktiv<>p2.aktiv)
);";
admin/sync/fas/sync_fas_vilesci_person.php
+1 -1
View File
@@ -189,7 +189,7 @@ p2.bismelden AS bismelden2, p2.titel AS titel2, p2.uid AS uid2, p2.gebnation AS
FROM person AS p1, person AS p2 WHERE
((p1.gebdat=p2.gebdat AND p1.familienname=p2.familienname AND p1.vorname=p2.vorname)
OR ((p1.ersatzkennzeichen=p2.ersatzkennzeichen AND p1.ersatzkennzeichen<>'') OR (p1.svnr=p2.svnr AND p1.svnr<>'')))
AND (p1.person_pk < p2.person_pk)
AND (p1.person_pk <> p2.person_pk)
AND (p1.familienname<>p2.familienname OR p1.vorname<>p2.vorname OR p1.vornamen<>p2.vornamen OR p1.geschlecht<>p2.geschlecht OR p1.gebdat<>p2.gebdat OR p1.staatsbuergerschaft<> p2.staatsbuergerschaft OR p1.familienstand<>p2.familienstAND OR p1.svnr<>p2.svnr OR p1.ersatzkennzeichen<>p2.ersatzkennzeichen OR p1.anrede<>p2.anrede OR p1.anzahlderkinder<>p2.anzahlderkinder OR p1.bismelden<>p2.bismelden OR p1.titel<>p2.titel OR p1.gebnation<>p2.gebnation OR p1.postnomentitel<> p2.postnomentitel)
);";
if($result = pg_query($conn_fas, $qry))
admin/sync/fas/sync_fas_vilesci_student.php
+1 -1
View File
@@ -413,7 +413,7 @@ FROM (person JOIN student ON person_pk=student.person_fk ) AS p1
CROSS JOIN (person JOIN student ON person_pk=student.person_fk) AS p2 WHERE
((p1.gebdat=p2.gebdat AND p1.familienname=p2.familienname AND p1.vorname=p2.vorname)
OR ((p1.ersatzkennzeichen=p2.ersatzkennzeichen AND p1.ersatzkennzeichen<>'') OR (p1.svnr=p2.svnr AND p1.svnr<>'')))
AND (p1.person_pk < p2.person_pk)
AND (p1.person_pk <> p2.person_pk)
AND (p1.svnr<>'0005010400' AND p2.svnr<>'0005010400')
AND (trim(p1.familienname)<>trim(p2.familienname) OR trim(p1.vorname)<>trim(p2.vorname) OR trim(p1.vornamen)<>trim(p2.vornamen)
OR p1.geschlecht<>p2.geschlecht