diff --git a/superx/WEB-INF/conf/edustore/db/install/MODULINFO b/superx/WEB-INF/conf/edustore/db/install/MODULINFO index eebac7c..ce8c33f 100644 --- a/superx/WEB-INF/conf/edustore/db/install/MODULINFO +++ b/superx/WEB-INF/conf/edustore/db/install/MODULINFO @@ -1,6 +1,6 @@ #!/bin/bash -export MODUL_VERSION=5.4b +export MODUL_VERSION=5.3 export MODULNAME=kern export SACHGEBIETID=0 export SACHGEBIET=Administration diff --git a/superx/WEB-INF/conf/edustore/db/install/VERSION b/superx/WEB-INF/conf/edustore/db/install/VERSION index 15c33b3..d346e2a 100644 --- a/superx/WEB-INF/conf/edustore/db/install/VERSION +++ b/superx/WEB-INF/conf/edustore/db/install/VERSION @@ -1 +1 @@ -5.4b +5.3 diff --git a/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_drop_pg.xml b/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_drop_pg.xml index ad4e476..7010fa3 100644 --- a/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_drop_pg.xml +++ b/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_drop_pg.xml @@ -487,12 +487,6 @@ eduetl:drop table if exists group_portlet_bez cascade; - -eduetl:drop table if exists user_antrag cascade; - - -eduetl:drop table if exists user_antrag_kostenstellen cascade; - eduetl:drop table if exists kern_cifx_neu cascade; diff --git a/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_integrate_pg.sql b/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_integrate_pg.sql index c0c2393..2d2ac8d 100644 --- a/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_integrate_pg.sql +++ b/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_integrate_pg.sql @@ -7,7 +7,7 @@ -- Fülle db_version delete from db_version where his_system='kern'; -insert into db_version (his_system,version,systeminfo_id) values('kern','5.4b',9); +insert into db_version (his_system,version,systeminfo_id) values('kern','5.3',9); @@ -210,10 +210,6 @@ delete from db_tabellen where name='user_portlet_bez'; insert into db_tabellen (name,protokollierung) values('user_portlet_bez',0); delete from db_tabellen where name='group_portlet_bez'; insert into db_tabellen (name,protokollierung) values('group_portlet_bez',0); -delete from db_tabellen where name='user_antrag'; -insert into db_tabellen (name,protokollierung) values('user_antrag',0); -delete from db_tabellen where name='user_antrag_kostenstellen'; -insert into db_tabellen (name,protokollierung) values('user_antrag_kostenstellen',0); delete from db_tabellen where name='kern_cifx_neu'; insert into db_tabellen (name,protokollierung) values('kern_cifx_neu',0); delete from db_tabellen where name='sieve'; diff --git a/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_upgrade2_pg.xml b/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_upgrade2_pg.xml index 334daca..a9d17fe 100644 --- a/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_upgrade2_pg.xml +++ b/superx/WEB-INF/conf/edustore/db/install/conf/his1/edustore_install/edustore_kern_upgrade2_pg.xml @@ -263,7 +263,7 @@ -eduetl:UPDATE db_version SET version = '5.4b' +eduetl:UPDATE db_version SET version = '5.3' WHERE his_system = 'kern'; eduetl:select setval('themenbaum_tid_seq',(select max(tid)+1 from themenbaum)); diff --git a/superx/WEB-INF/conf/edustore/db/install/conf/kern.html b/superx/WEB-INF/conf/edustore/db/install/conf/kern.html index 70c4a0c..9c0772c 100644 --- a/superx/WEB-INF/conf/edustore/db/install/conf/kern.html +++ b/superx/WEB-INF/conf/edustore/db/install/conf/kern.html @@ -94,7 +94,7 @@ font-style:italic: SuperX-Version2 -Modulversion5.4b +Modulversion5.3 SachgebietAdministration id 0 @@ -472,12 +472,6 @@ font-style:italic: update_prot_neu
  • -user_antrag -
    • -
  • -user_antrag_kostenstellen -
    • -
  • user_dialog
  • @@ -919,12 +913,6 @@ font-style:italic: update_prot_neu
  • -user_antrag -
    • -
  • -user_antrag_kostenstellen -
    • -
  • user_dialog
  • @@ -1285,12 +1273,6 @@ font-style:italic: update_prot_neu
  • -user_antrag -
    • -
  • -user_antrag_kostenstellen -
    • -
  • user_dialog
  • @@ -1756,12 +1738,6 @@ font-style:italic: trans_inst
  • -user_antrag -
    • -
  • -user_antrag_kostenstellen -
    • -
  • user_dialog
  • @@ -6786,161 +6762,6 @@ systeminfo_id );
      Wird benutzt in folgenden Masken:
    -Tabelle user_antrag (Nutzungsanträge) -
    -

    -

    Typ: Schlüsseltabelle, Themenbereich: Administration

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    FeldnameFeldtypGrößeDefaultNot NullBeschreibungKommentarFremdschlüssel
    tidSERIAL10trueAntrag ID
    antragsteller_titelVARCHAR50falseAntragsteller Titel
    antragsteller_vornameVARCHAR200trueAntragsteller Vorname
    antragsteller_nachnameVARCHAR200trueAntragsteller Nachname
    antragsteller_emailVARCHAR200trueAntragsteller E-Mail
    antragsteller_benutzerkennungVARCHAR200trueBenutzerkennung
    antragsteller_einrichtungVARCHAR200trueEinrichtung
    antragsteller_funktionVARCHAR200trueFunktion
    antragsteller_funktion_gueltig_bisDATE13falseFunktion gültig bis
    vorgesetzter_titelVARCHAR200falseVorgesetzter Titel
    vorgesetzter_vornameVARCHAR200trueVorgesetzter Vorname
    vorgesetzter_nachnameVARCHAR200trueVorgesetzter Nachname
    vorgesetzter_emailVARCHAR200trueVorgesetzter E-Mail
    daten_bewerber_zulassungSMALLINT5trueBeantragter Datenzugriff Bewerbungen
    daten_stud_absolvSMALLINT5trueBeantragter Datenzugriff Studierende
    daten_personal_stellenSMALLINT5trueBeantragter Datenzugriff Personal
    daten_finanzenSMALLINT5trueBeantragter Datenzugriff Finanzen
    antragsartVARCHAR100trueAntragsart
    fin_personal_projektVARCHAR100falseProjekt
    antragsdatumDATE13trueAntragsdatum
    antragsempfaengerVARCHAR200trueAntragsempfänger
    antrag_email1adresseVARCHAR200falseAntragsempfänger E-Mail
    antrag_email1_versendetDATETIME29falseAntragsempfänger Email versendet am
    genehmigung1_useridINTEGER10falseGenehmigung 1 vonuserinfo : tid -
    -
    genehmigung1_zeitpunktDATETIME29falseGenehmigung 1 Zeitpunkt
    genehmigung1_titelVARCHAR100falseGenehmigung 1 Titel
    genehmigung1_vornameVARCHAR200falseGenehmigung 1 Vorname
    genehmigung1_nachnameVARCHAR200falseGenehmigung 1 Nachname
    genehmigung1_email_versendetDATETIME29falseGenehmigung 1 Email versendet am
    genehmigung2_useridINTEGER10falseGenehmigung 2 vonuserinfo : tid -
    -
    genehmigung2_zeitpunktDATETIME29falseGenehmigung 2 Zeitpunkt
    genehmigung2_notizVARCHAR2147483647falseGenehmigung 2 Notiz
    uuidVARCHAR255falseUUID
    genehmigung2_email_versendetDATETIME29falseGenehmigung 2 Email versendet
    -

    Primärschlüssel user_antrag_pkey -

    -
      -
    1. tid
      2. -
    -
      -
        Wird benutzt in folgenden Masken: -
      -
      -Tabelle user_antrag_kostenstellen (Nutzungsanträge zu Kostenstellen) -
      -

      -

      Typ: Schlüsseltabelle, Themenbereich: Administration

      - - - - - - - - - - - - - -
      FeldnameFeldtypGrößeDefaultNot NullBeschreibungKommentarFremdschlüssel
      tidSERIAL4trueLaufnummer
      antrag_idINTEGER10trueAntraguser_antrag : tid -
      -
      kostenstelleCHAR10trueKostenstelleorganigramm : key_apnr -
      -
      -

      Primärschlüssel user_antrag_kostenstellen_pkey -

      -
        -
      1. tid
        2. -
      -
        -
          Wird benutzt in folgenden Masken: -
        -
        Tabelle user_dialog

        diff --git a/superx/WEB-INF/conf/edustore/db/install/conf/kern.xml b/superx/WEB-INF/conf/edustore/db/install/conf/kern.xml index f489f15..33b5666 100644 --- a/superx/WEB-INF/conf/edustore/db/install/conf/kern.xml +++ b/superx/WEB-INF/conf/edustore/db/install/conf/kern.xml @@ -1,6 +1,6 @@ - @@ -4617,85 +4617,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -user_antrag -tid -1 -user_antrag_pkey - - - - - - - - -
        - - - - - - - - - - - -user_antrag_kostenstellen -tid -1 -user_antrag_kostenstellen_pkey - - - - - - - - -
        - LAdetabelle für zentrale Stammdaten (derzeit Kostenstellen/Orgunits) durch HLR gefüllt @@ -9055,25 +8976,6 @@ where dimension_bp_id=(select D.tid from dimension_bp D where D.apnr='bluep_absc displayType="select" visibleFields="name" format="%s"> - - - - - - - - - - - - - @@ -12389,24 +12291,6 @@ mode="full"> - -
        -In diesem Formular können Sie Anträge verwalten. - -tid - - - diff --git a/superx/WEB-INF/conf/edustore/db/install/conf/kern_load.html b/superx/WEB-INF/conf/edustore/db/install/conf/kern_load.html index a017718..11f1602 100644 --- a/superx/WEB-INF/conf/edustore/db/install/conf/kern_load.html +++ b/superx/WEB-INF/conf/edustore/db/install/conf/kern_load.html @@ -92,7 +92,7 @@ font-style:italic:         - + diff --git a/superx/WEB-INF/conf/edustore/db/install/conf/module_alter_table_schema.x b/superx/WEB-INF/conf/edustore/db/install/conf/module_alter_table_schema.x index 55cabd6..66d42f9 100755 --- a/superx/WEB-INF/conf/edustore/db/install/conf/module_alter_table_schema.x +++ b/superx/WEB-INF/conf/edustore/db/install/conf/module_alter_table_schema.x @@ -109,8 +109,6 @@ DOQUERY "alter table user_preset_values SET SCHEMA $SCHEMA;" DOQUERY "alter table sx_portlet SET SCHEMA $SCHEMA;" DOQUERY "alter table user_portlet_bez SET SCHEMA $SCHEMA;" DOQUERY "alter table group_portlet_bez SET SCHEMA $SCHEMA;" -DOQUERY "alter table user_antrag SET SCHEMA $SCHEMA;" -DOQUERY "alter table user_antrag_kostenstellen SET SCHEMA $SCHEMA;" DOQUERY "alter table kern_cifx_neu SET SCHEMA $SCHEMA;" DOQUERY "alter table sieve SET SCHEMA $SCHEMA;" DOQUERY "alter table sieve_column_def SET SCHEMA $SCHEMA;" diff --git a/superx/WEB-INF/conf/edustore/db/install/conf/module_grant.x b/superx/WEB-INF/conf/edustore/db/install/conf/module_grant.x index f16d8f0..321643e 100755 --- a/superx/WEB-INF/conf/edustore/db/install/conf/module_grant.x +++ b/superx/WEB-INF/conf/edustore/db/install/conf/module_grant.x @@ -325,20 +325,6 @@ fi DOQUERY "grant $RIGHT on user_portlet_bez to $GRANTEE;" DOQUERY "grant $RIGHT on group_portlet_bez to $GRANTEE;" -DOQUERY "grant $RIGHT on user_antrag to $GRANTEE;" - -if [ "$DATABASE" == "POSTGRES" -a "$RIGHT" != "select" ] - then -DOQUERY "grant update on user_antrag_tid_seq to $GRANTEE;" -fi - -DOQUERY "grant $RIGHT on user_antrag_kostenstellen to $GRANTEE;" - -if [ "$DATABASE" == "POSTGRES" -a "$RIGHT" != "select" ] - then -DOQUERY "grant update on user_antrag_kostenstellen_tid_seq to $GRANTEE;" -fi - DOQUERY "grant $RIGHT on kern_cifx_neu to $GRANTEE;" DOQUERY "grant $RIGHT on sieve to $GRANTEE;" diff --git a/superx/WEB-INF/conf/edustore/db/install/conf/module_metadata.sql b/superx/WEB-INF/conf/edustore/db/install/conf/module_metadata.sql index 091398b..f807b79 100644 --- a/superx/WEB-INF/conf/edustore/db/install/conf/module_metadata.sql +++ b/superx/WEB-INF/conf/edustore/db/install/conf/module_metadata.sql @@ -2,7 +2,7 @@ --SQL Script automatisch generiert von SuperX module_upgrade.xsl delete from db_version where his_system='kern'; -insert into db_version (his_system,version,systeminfo_id) values('kern','5.4b',9); +insert into db_version (his_system,version,systeminfo_id) values('kern','5.3',9); CREATE temp TABLE tmp_db_forms ( diff --git a/superx/WEB-INF/conf/edustore/db/install/conf/module_revoke.x b/superx/WEB-INF/conf/edustore/db/install/conf/module_revoke.x index a6623a6..347cc7d 100755 --- a/superx/WEB-INF/conf/edustore/db/install/conf/module_revoke.x +++ b/superx/WEB-INF/conf/edustore/db/install/conf/module_revoke.x @@ -325,20 +325,6 @@ fi DOQUERY "revoke $RIGHT on user_portlet_bez from $GRANTEE;" DOQUERY "revoke $RIGHT on group_portlet_bez from $GRANTEE;" -DOQUERY "revoke $RIGHT on user_antrag from $GRANTEE;" - -if [ "$DATABASE" == "POSTGRES" -a "$RIGHT" != "select" ] - then -DOQUERY "revoke update on user_antrag_tid_seq from $GRANTEE;" -fi - -DOQUERY "revoke $RIGHT on user_antrag_kostenstellen from $GRANTEE;" - -if [ "$DATABASE" == "POSTGRES" -a "$RIGHT" != "select" ] - then -DOQUERY "revoke update on user_antrag_kostenstellen_tid_seq from $GRANTEE;" -fi - DOQUERY "revoke $RIGHT on kern_cifx_neu from $GRANTEE;" DOQUERY "revoke $RIGHT on sieve from $GRANTEE;" diff --git a/superx/WEB-INF/conf/edustore/db/install/conf/sx_fields_fuellen.sql b/superx/WEB-INF/conf/edustore/db/install/conf/sx_fields_fuellen.sql index 2e775c0..7a277b1 100644 --- a/superx/WEB-INF/conf/edustore/db/install/conf/sx_fields_fuellen.sql +++ b/superx/WEB-INF/conf/edustore/db/install/conf/sx_fields_fuellen.sql @@ -19989,850 +19989,6 @@ values('update_prot_neu', 0, 1); -insert into tmp_fields ( -table_name, -name, -caption, -description, -field_type, -field_size, -field_not_null, -currentlyUsed, -check_integrity, -is_sum) -values('user_antrag', -'tid', -'Antrag ID', -'', -'SERIAL', -'10', -1, -1, -0, -1); - -update tmp_fields set is_primarykey=1 -where trim(table_name) || '_' || trim(name) ='user_antrag_tid'; - -insert into tmp_fields ( -table_name, -name, -caption, -description, -field_type, -field_size, -field_not_null, -currentlyUsed, -check_integrity, -is_sum) -values('user_antrag', -'antragsteller_titel', -'Antragsteller Titel', -'', -'VARCHAR', -'50', -0, -1, -0, -1); - -insert into tmp_fields ( -table_name, -name, -caption, -description, -field_type, -field_size, -field_not_null, -currentlyUsed, -check_integrity, -is_sum) -values('user_antrag', -'antragsteller_vorname', -'Antragsteller Vorname', -'', -'VARCHAR', -'200', -1, -1, -0, -1); - -insert into tmp_fields ( -table_name, -name, -caption, -description, -field_type, -field_size, -field_not_null, -currentlyUsed, -check_integrity, -is_sum) -values('user_antrag', -'antragsteller_nachname', -'Antragsteller Nachname', -'', -'VARCHAR', -'200', -1, -1, -0, -1); - -insert into tmp_fields ( -table_name, -name, -caption, -description, -field_type, -field_size, -field_not_null, -currentlyUsed, -check_integrity, -is_sum) -values('user_antrag', -'antragsteller_email', -'Antragsteller E-Mail', -'', -'VARCHAR', -'200', -1, -1, -0, -1); - -insert into tmp_fields ( -table_name, -name, -caption, -description, -field_type, -field_size, -field_not_null, -currentlyUsed, -check_integrity, -is_sum) -values('user_antrag', -'antragsteller_benutzerkennung', -'Benutzerkennung', -'', -'VARCHAR', -'200', -1, -1, -0, -1); - -insert into tmp_fields ( -table_name, -name, -caption, -description, -field_type, -field_size, -field_not_null, -currentlyUsed, -check_integrity, -is_sum) -values('user_antrag', -'antragsteller_einrichtung', -'Einrichtung', -'', -'VARCHAR', -'200', -1, -1, -0, -1); - -insert into tmp_fields ( -table_name, -name, -caption, -description, -field_type, -field_size, -field_not_null, -currentlyUsed, -check_integrity, -is_sum) -values('user_antrag', -'antragsteller_funktion', -'Funktion', -'', -'VARCHAR', -'200', -1, -1, -0, -1); - -insert into tmp_fields ( -table_name, -name, -caption, -description, -field_type, -field_size, -field_not_null, -currentlyUsed, -check_integrity, -is_sum) -values('user_antrag', -'antragsteller_funktion_gueltig_bis', -'Funktion gültig bis', -'', -'DATE', -'13', -0, -1, -0, -1); - -insert into tmp_fields ( -table_name, -name, -caption, -description, -field_type, -field_size, -field_not_null, -currentlyUsed, -check_integrity, -is_sum) -values('user_antrag', -'vorgesetzter_titel', -'Vorgesetzter Titel', -'', -'VARCHAR', -'200', -0, -1, -0, -1); - -insert into tmp_fields ( -table_name, -name, -caption, -description, -field_type, -field_size, -field_not_null, -currentlyUsed, -check_integrity, -is_sum) -values('user_antrag', -'vorgesetzter_vorname', -'Vorgesetzter Vorname', -'', -'VARCHAR', -'200', -1, -1, -0, -1); - -insert into tmp_fields ( -table_name, -name, -caption, -description, -field_type, -field_size, -field_not_null, -currentlyUsed, -check_integrity, -is_sum) -values('user_antrag', -'vorgesetzter_nachname', -'Vorgesetzter Nachname', -'', -'VARCHAR', -'200', -1, -1, -0, -1); - -insert into tmp_fields ( -table_name, -name, -caption, -description, -field_type, -field_size, -field_not_null, -currentlyUsed, -check_integrity, -is_sum) -values('user_antrag', -'vorgesetzter_email', -'Vorgesetzter E-Mail', -'', -'VARCHAR', -'200', -1, -1, -0, -1); - -insert into tmp_fields ( -table_name, -name, -caption, -description, -field_type, -field_size, -field_not_null, -currentlyUsed, -check_integrity, -is_sum) -values('user_antrag', -'daten_bewerber_zulassung', -'Beantragter Datenzugriff Bewerbungen', -'', -'SMALLINT', -'5', -1, -1, -0, -1); - -insert into tmp_fields ( -table_name, -name, -caption, -description, -field_type, -field_size, -field_not_null, -currentlyUsed, -check_integrity, -is_sum) -values('user_antrag', -'daten_stud_absolv', -'Beantragter Datenzugriff Studierende', -'', -'SMALLINT', -'5', -1, -1, -0, -1); - -insert into tmp_fields ( -table_name, -name, -caption, -description, -field_type, -field_size, -field_not_null, -currentlyUsed, -check_integrity, -is_sum) -values('user_antrag', -'daten_personal_stellen', -'Beantragter Datenzugriff Personal', -'', -'SMALLINT', -'5', -1, -1, -0, -1); - -insert into tmp_fields ( -table_name, -name, -caption, -description, -field_type, -field_size, -field_not_null, -currentlyUsed, -check_integrity, -is_sum) -values('user_antrag', -'daten_finanzen', -'Beantragter Datenzugriff Finanzen', -'', -'SMALLINT', -'5', -1, -1, -0, -1); - -insert into tmp_fields ( -table_name, -name, -caption, -description, -field_type, -field_size, -field_not_null, -currentlyUsed, -check_integrity, -is_sum) -values('user_antrag', -'antragsart', -'Antragsart', -'', -'VARCHAR', -'100', -1, -1, -0, -1); - -insert into tmp_fields ( -table_name, -name, -caption, -description, -field_type, -field_size, -field_not_null, -currentlyUsed, -check_integrity, -is_sum) -values('user_antrag', -'fin_personal_projekt', -'Projekt', -'', -'VARCHAR', -'100', -0, -1, -0, -1); - -insert into tmp_fields ( -table_name, -name, -caption, -description, -field_type, -field_size, -field_not_null, -currentlyUsed, -check_integrity, -is_sum) -values('user_antrag', -'antragsdatum', -'Antragsdatum', -'', -'DATE', -'13', -1, -1, -0, -1); - -insert into tmp_fields ( -table_name, -name, -caption, -description, -field_type, -field_size, -field_not_null, -currentlyUsed, -check_integrity, -is_sum) -values('user_antrag', -'antragsempfaenger', -'Antragsempfänger', -'', -'VARCHAR', -'200', -1, -1, -0, -1); - -insert into tmp_fields ( -table_name, -name, -caption, -description, -field_type, -field_size, -field_not_null, -currentlyUsed, -check_integrity, -is_sum) -values('user_antrag', -'antrag_email1adresse', -'Antragsempfänger E-Mail', -'', -'VARCHAR', -'200', -0, -1, -0, -1); - -insert into tmp_fields ( -table_name, -name, -caption, -description, -field_type, -field_size, -field_not_null, -currentlyUsed, -check_integrity, -is_sum) -values('user_antrag', -'antrag_email1_versendet', -'Antragsempfänger Email versendet am', -'', -'DATETIME', -'29', -0, -1, -0, -1); - -insert into tmp_fields ( -table_name, -name, -caption, -description, -field_type, -field_size, -field_not_null, -currentlyUsed, -check_integrity, -is_sum) -values('user_antrag', -'genehmigung1_userid', -'Genehmigung 1 von', -'', -'INTEGER', -'10', -0, -1, -0, -1); - -update tmp_fields set foreignkey_tab='userinfo', -foreignkey_col='tid', -foreignkey_cap='name', -foreignkey_uniquename='' -where trim(table_name) || '_' || trim(name) ='user_antrag_genehmigung1_userid'; - -insert into tmp_fields ( -table_name, -name, -caption, -description, -field_type, -field_size, -field_not_null, -currentlyUsed, -check_integrity, -is_sum) -values('user_antrag', -'genehmigung1_zeitpunkt', -'Genehmigung 1 Zeitpunkt', -'', -'DATETIME', -'29', -0, -1, -0, -1); - -insert into tmp_fields ( -table_name, -name, -caption, -description, -field_type, -field_size, -field_not_null, -currentlyUsed, -check_integrity, -is_sum) -values('user_antrag', -'genehmigung1_titel', -'Genehmigung 1 Titel', -'', -'VARCHAR', -'100', -0, -1, -0, -1); - -insert into tmp_fields ( -table_name, -name, -caption, -description, -field_type, -field_size, -field_not_null, -currentlyUsed, -check_integrity, -is_sum) -values('user_antrag', -'genehmigung1_vorname', -'Genehmigung 1 Vorname', -'', -'VARCHAR', -'200', -0, -1, -0, -1); - -insert into tmp_fields ( -table_name, -name, -caption, -description, -field_type, -field_size, -field_not_null, -currentlyUsed, -check_integrity, -is_sum) -values('user_antrag', -'genehmigung1_nachname', -'Genehmigung 1 Nachname', -'', -'VARCHAR', -'200', -0, -1, -0, -1); - -insert into tmp_fields ( -table_name, -name, -caption, -description, -field_type, -field_size, -field_not_null, -currentlyUsed, -check_integrity, -is_sum) -values('user_antrag', -'genehmigung1_email_versendet', -'Genehmigung 1 Email versendet am', -'', -'DATETIME', -'29', -0, -1, -0, -1); - -insert into tmp_fields ( -table_name, -name, -caption, -description, -field_type, -field_size, -field_not_null, -currentlyUsed, -check_integrity, -is_sum) -values('user_antrag', -'genehmigung2_userid', -'Genehmigung 2 von', -'', -'INTEGER', -'10', -0, -1, -0, -1); - -update tmp_fields set foreignkey_tab='userinfo', -foreignkey_col='tid', -foreignkey_cap='name', -foreignkey_uniquename='' -where trim(table_name) || '_' || trim(name) ='user_antrag_genehmigung2_userid'; - -insert into tmp_fields ( -table_name, -name, -caption, -description, -field_type, -field_size, -field_not_null, -currentlyUsed, -check_integrity, -is_sum) -values('user_antrag', -'genehmigung2_zeitpunkt', -'Genehmigung 2 Zeitpunkt', -'', -'DATETIME', -'29', -0, -1, -0, -1); - -insert into tmp_fields ( -table_name, -name, -caption, -description, -field_type, -field_size, -field_not_null, -currentlyUsed, -check_integrity, -is_sum) -values('user_antrag', -'genehmigung2_notiz', -'Genehmigung 2 Notiz', -'', -'VARCHAR', -'2147483647', -0, -1, -0, -1); - -insert into tmp_fields ( -table_name, -name, -caption, -description, -field_type, -field_size, -field_not_null, -currentlyUsed, -check_integrity, -is_sum) -values('user_antrag', -'uuid', -'UUID', -'', -'VARCHAR', -'255', -0, -1, -0, -1); - -insert into tmp_fields ( -table_name, -name, -caption, -description, -field_type, -field_size, -field_not_null, -currentlyUsed, -check_integrity, -is_sum) -values('user_antrag', -'genehmigung2_email_versendet', -'Genehmigung 2 Email versendet', -'', -'DATETIME', -'29', -0, -1, -0, -1); - -insert into tmp_fields ( -table_name, -name, -caption, -description, -field_type, -field_size, -field_not_null, -currentlyUsed, -check_integrity, -is_sum) -values('user_antrag_kostenstellen', -'tid', -'Laufnummer', -'', -'SERIAL', -'4', -1, -1, -0, -1); - -update tmp_fields set is_primarykey=1 -where trim(table_name) || '_' || trim(name) ='user_antrag_kostenstellen_tid'; - -insert into tmp_fields ( -table_name, -name, -caption, -description, -field_type, -field_size, -field_not_null, -currentlyUsed, -check_integrity, -is_sum) -values('user_antrag_kostenstellen', -'antrag_id', -'Antrag', -'', -'INTEGER', -'10', -1, -1, -0, -1); - -update tmp_fields set foreignkey_tab='user_antrag', -foreignkey_col='tid', -foreignkey_cap='', -foreignkey_uniquename='' -where trim(table_name) || '_' || trim(name) ='user_antrag_kostenstellen_antrag_id'; - -insert into tmp_fields ( -table_name, -name, -caption, -description, -field_type, -field_size, -field_not_null, -currentlyUsed, -check_integrity, -is_sum) -values('user_antrag_kostenstellen', -'kostenstelle', -'Kostenstelle', -'', -'CHAR', -'10', -1, -1, -0, -1); - -update tmp_fields set foreignkey_tab='organigramm', -foreignkey_col='key_apnr', -foreignkey_cap='trim(key_apnr) || '' - '' || trim(name)', -foreignkey_uniquename='' -where trim(table_name) || '_' || trim(name) ='user_antrag_kostenstellen_kostenstelle'; - insert into tmp_fields ( table_name, name, diff --git a/superx/WEB-INF/conf/edustore/db/install/conf/sx_fields_loeschen.sql b/superx/WEB-INF/conf/edustore/db/install/conf/sx_fields_loeschen.sql index c7ba3f4..f416eb5 100644 --- a/superx/WEB-INF/conf/edustore/db/install/conf/sx_fields_loeschen.sql +++ b/superx/WEB-INF/conf/edustore/db/install/conf/sx_fields_loeschen.sql @@ -5280,228 +5280,6 @@ name) values('update_prot_neu', 'updated_at'); -insert into tmp_fields ( -table_name, -name) -values('user_antrag', -'tid'); - -insert into tmp_fields ( -table_name, -name) -values('user_antrag', -'antragsteller_titel'); - -insert into tmp_fields ( -table_name, -name) -values('user_antrag', -'antragsteller_vorname'); - -insert into tmp_fields ( -table_name, -name) -values('user_antrag', -'antragsteller_nachname'); - -insert into tmp_fields ( -table_name, -name) -values('user_antrag', -'antragsteller_email'); - -insert into tmp_fields ( -table_name, -name) -values('user_antrag', -'antragsteller_benutzerkennung'); - -insert into tmp_fields ( -table_name, -name) -values('user_antrag', -'antragsteller_einrichtung'); - -insert into tmp_fields ( -table_name, -name) -values('user_antrag', -'antragsteller_funktion'); - -insert into tmp_fields ( -table_name, -name) -values('user_antrag', -'antragsteller_funktion_gueltig_bis'); - -insert into tmp_fields ( -table_name, -name) -values('user_antrag', -'vorgesetzter_titel'); - -insert into tmp_fields ( -table_name, -name) -values('user_antrag', -'vorgesetzter_vorname'); - -insert into tmp_fields ( -table_name, -name) -values('user_antrag', -'vorgesetzter_nachname'); - -insert into tmp_fields ( -table_name, -name) -values('user_antrag', -'vorgesetzter_email'); - -insert into tmp_fields ( -table_name, -name) -values('user_antrag', -'daten_bewerber_zulassung'); - -insert into tmp_fields ( -table_name, -name) -values('user_antrag', -'daten_stud_absolv'); - -insert into tmp_fields ( -table_name, -name) -values('user_antrag', -'daten_personal_stellen'); - -insert into tmp_fields ( -table_name, -name) -values('user_antrag', -'daten_finanzen'); - -insert into tmp_fields ( -table_name, -name) -values('user_antrag', -'antragsart'); - -insert into tmp_fields ( -table_name, -name) -values('user_antrag', -'fin_personal_projekt'); - -insert into tmp_fields ( -table_name, -name) -values('user_antrag', -'antragsdatum'); - -insert into tmp_fields ( -table_name, -name) -values('user_antrag', -'antragsempfaenger'); - -insert into tmp_fields ( -table_name, -name) -values('user_antrag', -'antrag_email1adresse'); - -insert into tmp_fields ( -table_name, -name) -values('user_antrag', -'antrag_email1_versendet'); - -insert into tmp_fields ( -table_name, -name) -values('user_antrag', -'genehmigung1_userid'); - -insert into tmp_fields ( -table_name, -name) -values('user_antrag', -'genehmigung1_zeitpunkt'); - -insert into tmp_fields ( -table_name, -name) -values('user_antrag', -'genehmigung1_titel'); - -insert into tmp_fields ( -table_name, -name) -values('user_antrag', -'genehmigung1_vorname'); - -insert into tmp_fields ( -table_name, -name) -values('user_antrag', -'genehmigung1_nachname'); - -insert into tmp_fields ( -table_name, -name) -values('user_antrag', -'genehmigung1_email_versendet'); - -insert into tmp_fields ( -table_name, -name) -values('user_antrag', -'genehmigung2_userid'); - -insert into tmp_fields ( -table_name, -name) -values('user_antrag', -'genehmigung2_zeitpunkt'); - -insert into tmp_fields ( -table_name, -name) -values('user_antrag', -'genehmigung2_notiz'); - -insert into tmp_fields ( -table_name, -name) -values('user_antrag', -'uuid'); - -insert into tmp_fields ( -table_name, -name) -values('user_antrag', -'genehmigung2_email_versendet'); - -insert into tmp_fields ( -table_name, -name) -values('user_antrag_kostenstellen', -'tid'); - -insert into tmp_fields ( -table_name, -name) -values('user_antrag_kostenstellen', -'antrag_id'); - -insert into tmp_fields ( -table_name, -name) -values('user_antrag_kostenstellen', -'kostenstelle'); - insert into tmp_fields ( table_name, name) diff --git a/superx/WEB-INF/conf/edustore/db/install/conf/sx_tables_fuellen.sql b/superx/WEB-INF/conf/edustore/db/install/conf/sx_tables_fuellen.sql index 562f095..84d09f4 100644 --- a/superx/WEB-INF/conf/edustore/db/install/conf/sx_tables_fuellen.sql +++ b/superx/WEB-INF/conf/edustore/db/install/conf/sx_tables_fuellen.sql @@ -951,22 +951,6 @@ values('update_prot_neu','','Protokolltabelle für inkrementelles Laden (Ladetab 'Administration', 0); -insert into tmp_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id) -values('user_antrag','Nutzungsanträge','', -'Schlüsseltabelle', -9, -9, -'Administration', -0); - -insert into tmp_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id) -values('user_antrag_kostenstellen','Nutzungsanträge zu Kostenstellen','', -'Schlüsseltabelle', -9, -9, -'Administration', -0); - insert into tmp_tables (name,caption,description,table_type,systeminfo_id,systeminfo_orig,thema,sachgebiete_id) values('user_dialog','','', 'Schlüsseltabelle', diff --git a/superx/WEB-INF/conf/edustore/db/install/kern_backup.x b/superx/WEB-INF/conf/edustore/db/install/kern_backup.x index a7a8f80..4ff6fbe 100755 --- a/superx/WEB-INF/conf/edustore/db/install/kern_backup.x +++ b/superx/WEB-INF/conf/edustore/db/install/kern_backup.x @@ -128,8 +128,6 @@ DOQUERY "select userinfo_id, felderinfo_id, field_value from user_preset_values; DOQUERY "select tid, name, type, class, icon, content, sortnr_initial, visible, gueltig_von, gueltig_bis from sx_portlet;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/sx_portlet.unl txt DOQUERY "select userinfo_id, portlet_id from user_portlet_bez;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/user_portlet_bez.unl txt DOQUERY "select groupinfo_id, portlet_id from group_portlet_bez;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/group_portlet_bez.unl txt -DOQUERY "select tid, antragsteller_titel, antragsteller_vorname, antragsteller_nachname, antragsteller_email, antragsteller_benutzerkennung, antragsteller_einrichtung, antragsteller_funktion, antragsteller_funktion_gueltig_bis, vorgesetzter_titel, vorgesetzter_vorname, vorgesetzter_nachname, vorgesetzter_email, daten_bewerber_zulassung, daten_stud_absolv, daten_personal_stellen, daten_finanzen, antragsart, fin_personal_projekt, antragsdatum, antragsempfaenger, antrag_email1adresse, antrag_email1_versendet, genehmigung1_userid, genehmigung1_zeitpunkt, genehmigung1_titel, genehmigung1_vorname, genehmigung1_nachname, genehmigung1_email_versendet, genehmigung2_userid, genehmigung2_zeitpunkt, genehmigung2_notiz, uuid, genehmigung2_email_versendet from user_antrag;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/user_antrag.unl txt -DOQUERY "select tid, antrag_id, kostenstelle from user_antrag_kostenstellen;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/user_antrag_kostenstellen.unl txt DOQUERY "select tid, name, main_table, order_by, sachgebiete_id, systeminfo_id, post_processing, post_insert, finalize, active, hsnr from sieve;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/sieve.unl txt DOQUERY "select tid, m_id, bi_table, columnname, datatype, caption, explanation, xil_width, lookup_tab, lookup_joinsource, lookup_jointarget, lookup_target, lookup_cond, lookup_func, hinweis from sieve_column_def;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/sieve_column_def.unl txt DOQUERY "select tid, sieve_id, def_id, in_output, sortnr, active from sieve_column;" false $DBDELIMITER ${BACKUP_PFAD_INDIVIDUELL_MODULE}/sieve_column.unl txt diff --git a/superx/WEB-INF/conf/edustore/db/install/kern_drop_pg.sql b/superx/WEB-INF/conf/edustore/db/install/kern_drop_pg.sql index 000f5e7..9d14663 100644 --- a/superx/WEB-INF/conf/edustore/db/install/kern_drop_pg.sql +++ b/superx/WEB-INF/conf/edustore/db/install/kern_drop_pg.sql @@ -174,8 +174,6 @@ drop table if exists user_preset_values cascade; drop table if exists sx_portlet cascade; drop table if exists user_portlet_bez cascade; drop table if exists group_portlet_bez cascade; -drop table if exists user_antrag cascade; -drop table if exists user_antrag_kostenstellen cascade; drop table if exists kern_cifx_neu cascade; drop table if exists sieve cascade; drop table if exists sieve_column_def cascade; diff --git a/superx/WEB-INF/conf/edustore/db/install/kern_install_pg.sql b/superx/WEB-INF/conf/edustore/db/install/kern_install_pg.sql index a18958a..61d4990 100644 --- a/superx/WEB-INF/conf/edustore/db/install/kern_install_pg.sql +++ b/superx/WEB-INF/conf/edustore/db/install/kern_install_pg.sql @@ -3344,147 +3344,6 @@ select now(), 'Tabelle group_portlet_bez erzeugt'; -select now(), 'Erzeuge Tabelle user_antrag'; - -create table user_antrag( - tid SERIAL not null, -antragsteller_titel VARCHAR(50) , -antragsteller_vorname VARCHAR(200) not null, -antragsteller_nachname VARCHAR(200) not null, -antragsteller_email VARCHAR(200) not null, -antragsteller_benutzerkennung VARCHAR(200) not null, -antragsteller_einrichtung VARCHAR(200) not null, -antragsteller_funktion VARCHAR(200) not null, -antragsteller_funktion_gueltig_bis DATE , -vorgesetzter_titel VARCHAR(200) , -vorgesetzter_vorname VARCHAR(200) not null, -vorgesetzter_nachname VARCHAR(200) not null, -vorgesetzter_email VARCHAR(200) not null, -daten_bewerber_zulassung SMALLINT not null, -daten_stud_absolv SMALLINT not null, -daten_personal_stellen SMALLINT not null, -daten_finanzen SMALLINT not null, -antragsart VARCHAR(100) not null, -fin_personal_projekt VARCHAR(100) , -antragsdatum DATE not null, -antragsempfaenger VARCHAR(200) not null, -antrag_email1adresse VARCHAR(200) , -antrag_email1_versendet timestamptz , -genehmigung1_userid INTEGER , -genehmigung1_zeitpunkt timestamptz , -genehmigung1_titel VARCHAR(100) , -genehmigung1_vorname VARCHAR(200) , -genehmigung1_nachname VARCHAR(200) , -genehmigung1_email_versendet timestamptz , -genehmigung2_userid INTEGER , -genehmigung2_zeitpunkt timestamptz , -genehmigung2_notiz VARCHAR(2147483647) , -uuid VARCHAR(255) , -genehmigung2_email_versendet timestamptz , - constraint user_antrag_pkey primary key (tid) - -) -; - - - -comment on column user_antrag.tid is 'Antrag ID'; - -comment on column user_antrag.antragsteller_titel is 'Antragsteller Titel'; - -comment on column user_antrag.antragsteller_vorname is 'Antragsteller Vorname'; - -comment on column user_antrag.antragsteller_nachname is 'Antragsteller Nachname'; - -comment on column user_antrag.antragsteller_email is 'Antragsteller E-Mail'; - -comment on column user_antrag.antragsteller_benutzerkennung is 'Benutzerkennung'; - -comment on column user_antrag.antragsteller_einrichtung is 'Einrichtung'; - -comment on column user_antrag.antragsteller_funktion is 'Funktion'; - -comment on column user_antrag.antragsteller_funktion_gueltig_bis is 'Funktion gültig bis'; - -comment on column user_antrag.vorgesetzter_titel is 'Vorgesetzter Titel'; - -comment on column user_antrag.vorgesetzter_vorname is 'Vorgesetzter Vorname'; - -comment on column user_antrag.vorgesetzter_nachname is 'Vorgesetzter Nachname'; - -comment on column user_antrag.vorgesetzter_email is 'Vorgesetzter E-Mail'; - -comment on column user_antrag.daten_bewerber_zulassung is 'Beantragter Datenzugriff Bewerbungen'; - -comment on column user_antrag.daten_stud_absolv is 'Beantragter Datenzugriff Studierende'; - -comment on column user_antrag.daten_personal_stellen is 'Beantragter Datenzugriff Personal'; - -comment on column user_antrag.daten_finanzen is 'Beantragter Datenzugriff Finanzen'; - -comment on column user_antrag.antragsart is 'Antragsart'; - -comment on column user_antrag.fin_personal_projekt is 'Projekt'; - -comment on column user_antrag.antragsdatum is 'Antragsdatum'; - -comment on column user_antrag.antragsempfaenger is 'Antragsempfänger'; - -comment on column user_antrag.antrag_email1adresse is 'Antragsempfänger E-Mail'; - -comment on column user_antrag.antrag_email1_versendet is 'Antragsempfänger Email versendet am'; - -comment on column user_antrag.genehmigung1_userid is 'Genehmigung 1 von'; - -comment on column user_antrag.genehmigung1_zeitpunkt is 'Genehmigung 1 Zeitpunkt'; - -comment on column user_antrag.genehmigung1_titel is 'Genehmigung 1 Titel'; - -comment on column user_antrag.genehmigung1_vorname is 'Genehmigung 1 Vorname'; - -comment on column user_antrag.genehmigung1_nachname is 'Genehmigung 1 Nachname'; - -comment on column user_antrag.genehmigung1_email_versendet is 'Genehmigung 1 Email versendet am'; - -comment on column user_antrag.genehmigung2_userid is 'Genehmigung 2 von'; - -comment on column user_antrag.genehmigung2_zeitpunkt is 'Genehmigung 2 Zeitpunkt'; - -comment on column user_antrag.genehmigung2_notiz is 'Genehmigung 2 Notiz'; - -comment on column user_antrag.uuid is 'UUID'; - -comment on column user_antrag.genehmigung2_email_versendet is 'Genehmigung 2 Email versendet'; - - -select now(), 'Tabelle user_antrag erzeugt'; - - - -select now(), 'Erzeuge Tabelle user_antrag_kostenstellen'; - -create table user_antrag_kostenstellen( - tid SERIAL not null, -antrag_id INTEGER not null, -kostenstelle CHAR(10) not null, - constraint user_antrag_kostenstellen_pkey primary key (tid) - -) -; - - - -comment on column user_antrag_kostenstellen.tid is 'Laufnummer'; - -comment on column user_antrag_kostenstellen.antrag_id is 'Antrag'; - -comment on column user_antrag_kostenstellen.kostenstelle is 'Kostenstelle'; - - -select now(), 'Tabelle user_antrag_kostenstellen erzeugt'; - - - select now(), 'Erzeuge Tabelle kern_cifx_neu'; create table kern_cifx_neu( @@ -5615,7 +5474,7 @@ select now(), 'Fülle db_version'; delete from db_version where his_system='kern'; -insert into db_version (his_system,version,systeminfo_id) values('kern','5.4b',9); +insert into db_version (his_system,version,systeminfo_id) values('kern','5.3',9); @@ -5819,10 +5678,6 @@ delete from db_tabellen where name='user_portlet_bez'; insert into db_tabellen (name,protokollierung) values('user_portlet_bez',0); delete from db_tabellen where name='group_portlet_bez'; insert into db_tabellen (name,protokollierung) values('group_portlet_bez',0); -delete from db_tabellen where name='user_antrag'; -insert into db_tabellen (name,protokollierung) values('user_antrag',0); -delete from db_tabellen where name='user_antrag_kostenstellen'; -insert into db_tabellen (name,protokollierung) values('user_antrag_kostenstellen',0); delete from db_tabellen where name='kern_cifx_neu'; insert into db_tabellen (name,protokollierung) values('kern_cifx_neu',0); delete from db_tabellen where name='sieve'; diff --git a/superx/WEB-INF/conf/edustore/db/install/kern_restore.x b/superx/WEB-INF/conf/edustore/db/install/kern_restore.x index 634fc2b..9646d19 100755 --- a/superx/WEB-INF/conf/edustore/db/install/kern_restore.x +++ b/superx/WEB-INF/conf/edustore/db/install/kern_restore.x @@ -103,8 +103,6 @@ sx_auto_upload_table.x user_preset_values tmp"$MANDANTENID"/user_preset_values.u sx_auto_upload_table.x sx_portlet tmp"$MANDANTENID"/sx_portlet.unl sx_auto_upload_table.x user_portlet_bez tmp"$MANDANTENID"/user_portlet_bez.unl sx_auto_upload_table.x group_portlet_bez tmp"$MANDANTENID"/group_portlet_bez.unl -sx_auto_upload_table.x user_antrag tmp"$MANDANTENID"/user_antrag.unl -sx_auto_upload_table.x user_antrag_kostenstellen tmp"$MANDANTENID"/user_antrag_kostenstellen.unl sx_auto_upload_table.x sieve tmp"$MANDANTENID"/sieve.unl sx_auto_upload_table.x sieve_column_def tmp"$MANDANTENID"/sieve_column_def.unl sx_auto_upload_table.x sieve_column tmp"$MANDANTENID"/sieve_column.unl diff --git a/superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_fields_pg.sql b/superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_fields_pg.sql index f73f491..e186c85 100644 --- a/superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_fields_pg.sql +++ b/superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_fields_pg.sql @@ -107,8 +107,6 @@ and C.relname::varchar(255) in ('sichtart_rechttabelle', 'sx_portlet', 'user_portlet_bez', 'group_portlet_bez', -'user_antrag', -'user_antrag_kostenstellen', 'kern_cifx_neu', 'sieve', 'sieve_column_def', @@ -248,8 +246,6 @@ and N.nspname||'.'||C.relname in ('sichtart_rechttabelle', 'sx_portlet', 'user_portlet_bez', 'group_portlet_bez', -'user_antrag', -'user_antrag_kostenstellen', 'kern_cifx_neu', 'sieve', 'sieve_column_def', @@ -6935,339 +6931,6 @@ alter table group_portlet_bez add column portlet_id INTEGER ; -<#if !fields?seq_contains("user_antrag.tid") > - - -select now(), 'field user_antrag.tid will be added'; - -alter table user_antrag add column tid SERIAL not null; - - - -<#if !fields?seq_contains("user_antrag.antragsteller_titel") > - - -select now(), 'field user_antrag.antragsteller_titel will be added'; - -alter table user_antrag add column antragsteller_titel VARCHAR(50) ; - - - -<#if !fields?seq_contains("user_antrag.antragsteller_vorname") > - - -select now(), 'field user_antrag.antragsteller_vorname will be added'; - -alter table user_antrag add column antragsteller_vorname VARCHAR(200) not null; - - - -<#if !fields?seq_contains("user_antrag.antragsteller_nachname") > - - -select now(), 'field user_antrag.antragsteller_nachname will be added'; - -alter table user_antrag add column antragsteller_nachname VARCHAR(200) not null; - - - -<#if !fields?seq_contains("user_antrag.antragsteller_email") > - - -select now(), 'field user_antrag.antragsteller_email will be added'; - -alter table user_antrag add column antragsteller_email VARCHAR(200) not null; - - - -<#if !fields?seq_contains("user_antrag.antragsteller_benutzerkennung") > - - -select now(), 'field user_antrag.antragsteller_benutzerkennung will be added'; - -alter table user_antrag add column antragsteller_benutzerkennung VARCHAR(200) not null; - - - -<#if !fields?seq_contains("user_antrag.antragsteller_einrichtung") > - - -select now(), 'field user_antrag.antragsteller_einrichtung will be added'; - -alter table user_antrag add column antragsteller_einrichtung VARCHAR(200) not null; - - - -<#if !fields?seq_contains("user_antrag.antragsteller_funktion") > - - -select now(), 'field user_antrag.antragsteller_funktion will be added'; - -alter table user_antrag add column antragsteller_funktion VARCHAR(200) not null; - - - -<#if !fields?seq_contains("user_antrag.antragsteller_funktion_gueltig_bis") > - - -select now(), 'field user_antrag.antragsteller_funktion_gueltig_bis will be added'; - -alter table user_antrag add column antragsteller_funktion_gueltig_bis DATE ; - - - -<#if !fields?seq_contains("user_antrag.vorgesetzter_titel") > - - -select now(), 'field user_antrag.vorgesetzter_titel will be added'; - -alter table user_antrag add column vorgesetzter_titel VARCHAR(200) ; - - - -<#if !fields?seq_contains("user_antrag.vorgesetzter_vorname") > - - -select now(), 'field user_antrag.vorgesetzter_vorname will be added'; - -alter table user_antrag add column vorgesetzter_vorname VARCHAR(200) not null; - - - -<#if !fields?seq_contains("user_antrag.vorgesetzter_nachname") > - - -select now(), 'field user_antrag.vorgesetzter_nachname will be added'; - -alter table user_antrag add column vorgesetzter_nachname VARCHAR(200) not null; - - - -<#if !fields?seq_contains("user_antrag.vorgesetzter_email") > - - -select now(), 'field user_antrag.vorgesetzter_email will be added'; - -alter table user_antrag add column vorgesetzter_email VARCHAR(200) not null; - - - -<#if !fields?seq_contains("user_antrag.daten_bewerber_zulassung") > - - -select now(), 'field user_antrag.daten_bewerber_zulassung will be added'; - -alter table user_antrag add column daten_bewerber_zulassung SMALLINT not null; - - - -<#if !fields?seq_contains("user_antrag.daten_stud_absolv") > - - -select now(), 'field user_antrag.daten_stud_absolv will be added'; - -alter table user_antrag add column daten_stud_absolv SMALLINT not null; - - - -<#if !fields?seq_contains("user_antrag.daten_personal_stellen") > - - -select now(), 'field user_antrag.daten_personal_stellen will be added'; - -alter table user_antrag add column daten_personal_stellen SMALLINT not null; - - - -<#if !fields?seq_contains("user_antrag.daten_finanzen") > - - -select now(), 'field user_antrag.daten_finanzen will be added'; - -alter table user_antrag add column daten_finanzen SMALLINT not null; - - - -<#if !fields?seq_contains("user_antrag.antragsart") > - - -select now(), 'field user_antrag.antragsart will be added'; - -alter table user_antrag add column antragsart VARCHAR(100) not null; - - - -<#if !fields?seq_contains("user_antrag.fin_personal_projekt") > - - -select now(), 'field user_antrag.fin_personal_projekt will be added'; - -alter table user_antrag add column fin_personal_projekt VARCHAR(100) ; - - - -<#if !fields?seq_contains("user_antrag.antragsdatum") > - - -select now(), 'field user_antrag.antragsdatum will be added'; - -alter table user_antrag add column antragsdatum DATE not null; - - - -<#if !fields?seq_contains("user_antrag.antragsempfaenger") > - - -select now(), 'field user_antrag.antragsempfaenger will be added'; - -alter table user_antrag add column antragsempfaenger VARCHAR(200) not null; - - - -<#if !fields?seq_contains("user_antrag.antrag_email1adresse") > - - -select now(), 'field user_antrag.antrag_email1adresse will be added'; - -alter table user_antrag add column antrag_email1adresse VARCHAR(200) ; - - - -<#if !fields?seq_contains("user_antrag.antrag_email1_versendet") > - - -select now(), 'field user_antrag.antrag_email1_versendet will be added'; - -alter table user_antrag add column antrag_email1_versendet timestamptz ; - - - -<#if !fields?seq_contains("user_antrag.genehmigung1_userid") > - - -select now(), 'field user_antrag.genehmigung1_userid will be added'; - -alter table user_antrag add column genehmigung1_userid INTEGER ; - - - -<#if !fields?seq_contains("user_antrag.genehmigung1_zeitpunkt") > - - -select now(), 'field user_antrag.genehmigung1_zeitpunkt will be added'; - -alter table user_antrag add column genehmigung1_zeitpunkt timestamptz ; - - - -<#if !fields?seq_contains("user_antrag.genehmigung1_titel") > - - -select now(), 'field user_antrag.genehmigung1_titel will be added'; - -alter table user_antrag add column genehmigung1_titel VARCHAR(100) ; - - - -<#if !fields?seq_contains("user_antrag.genehmigung1_vorname") > - - -select now(), 'field user_antrag.genehmigung1_vorname will be added'; - -alter table user_antrag add column genehmigung1_vorname VARCHAR(200) ; - - - -<#if !fields?seq_contains("user_antrag.genehmigung1_nachname") > - - -select now(), 'field user_antrag.genehmigung1_nachname will be added'; - -alter table user_antrag add column genehmigung1_nachname VARCHAR(200) ; - - - -<#if !fields?seq_contains("user_antrag.genehmigung1_email_versendet") > - - -select now(), 'field user_antrag.genehmigung1_email_versendet will be added'; - -alter table user_antrag add column genehmigung1_email_versendet timestamptz ; - - - -<#if !fields?seq_contains("user_antrag.genehmigung2_userid") > - - -select now(), 'field user_antrag.genehmigung2_userid will be added'; - -alter table user_antrag add column genehmigung2_userid INTEGER ; - - - -<#if !fields?seq_contains("user_antrag.genehmigung2_zeitpunkt") > - - -select now(), 'field user_antrag.genehmigung2_zeitpunkt will be added'; - -alter table user_antrag add column genehmigung2_zeitpunkt timestamptz ; - - - -<#if !fields?seq_contains("user_antrag.genehmigung2_notiz") > - - -select now(), 'field user_antrag.genehmigung2_notiz will be added'; - -alter table user_antrag add column genehmigung2_notiz VARCHAR(2147483647) ; - - - -<#if !fields?seq_contains("user_antrag.uuid") > - - -select now(), 'field user_antrag.uuid will be added'; - -alter table user_antrag add column uuid VARCHAR(255) ; - - - -<#if !fields?seq_contains("user_antrag.genehmigung2_email_versendet") > - - -select now(), 'field user_antrag.genehmigung2_email_versendet will be added'; - -alter table user_antrag add column genehmigung2_email_versendet timestamptz ; - - - -<#if !fields?seq_contains("user_antrag_kostenstellen.tid") > - - -select now(), 'field user_antrag_kostenstellen.tid will be added'; - -alter table user_antrag_kostenstellen add column tid SERIAL not null; - - - -<#if !fields?seq_contains("user_antrag_kostenstellen.antrag_id") > - - -select now(), 'field user_antrag_kostenstellen.antrag_id will be added'; - -alter table user_antrag_kostenstellen add column antrag_id INTEGER not null; - - - -<#if !fields?seq_contains("user_antrag_kostenstellen.kostenstelle") > - - -select now(), 'field user_antrag_kostenstellen.kostenstelle will be added'; - -alter table user_antrag_kostenstellen add column kostenstelle CHAR(10) not null; - - - <#if !fields?seq_contains("kern_cifx_neu.key") > diff --git a/superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_indexes_pg.sql b/superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_indexes_pg.sql index 38e0fcc..99a7add 100644 --- a/superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_indexes_pg.sql +++ b/superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_indexes_pg.sql @@ -108,8 +108,6 @@ where D.relname::varchar(200) in ('sichtart_rechttabelle', 'sx_portlet', 'user_portlet_bez', 'group_portlet_bez', -'user_antrag', -'user_antrag_kostenstellen', 'kern_cifx_neu', 'sieve', 'sieve_column_def', @@ -250,8 +248,6 @@ and N.nspname||'.'||D.relname in ('sichtart_rechttabelle', 'sx_portlet', 'user_portlet_bez', 'group_portlet_bez', -'user_antrag', -'user_antrag_kostenstellen', 'kern_cifx_neu', 'sieve', 'sieve_column_def', diff --git a/superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_pg.sql b/superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_pg.sql index ba7a733..4e60559 100644 --- a/superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_pg.sql +++ b/superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_pg.sql @@ -376,7 +376,7 @@ select now(), 'Fülle db_version'; delete from db_version where his_system='kern'; -insert into db_version (his_system,version,systeminfo_id) values('kern','5.4b',9); +insert into db_version (his_system,version,systeminfo_id) values('kern','5.3',9); diff --git a/superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_tables_pg.sql b/superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_tables_pg.sql index 99347ac..18bf363 100644 --- a/superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_tables_pg.sql +++ b/superx/WEB-INF/conf/edustore/db/install/upgrade/kern_upgrade_tables_pg.sql @@ -103,8 +103,6 @@ select relname,relname as tabelle from pg_class JOIN pg_namespace ON pg_namespac 'sx_portlet', 'user_portlet_bez', 'group_portlet_bez', -'user_antrag', -'user_antrag_kostenstellen', 'kern_cifx_neu', 'sieve', 'sieve_column_def', @@ -239,8 +237,6 @@ select relname,relname as tabelle from pg_class JOIN pg_namespace ON pg_namespac 'sx_portlet', 'user_portlet_bez', 'group_portlet_bez', -'user_antrag', -'user_antrag_kostenstellen', 'kern_cifx_neu', 'sieve', 'sieve_column_def', @@ -4432,163 +4428,6 @@ comment on column group_portlet_bez.portlet_id is 'Portlet'; delete from db_tabellen where name='group_portlet_bez'; insert into db_tabellen (name,protokollierung) values('group_portlet_bez',0); -<#if !deleted_tables?seq_contains("user_antrag") && tables?is_sequence && tables?seq_contains("user_antrag") > - - -select now(), 'table user_antrag exists - fine'; - - -<#else> - - -select now(), 'Erzeuge Tabelle user_antrag'; - -create table user_antrag( - tid SERIAL not null, -antragsteller_titel VARCHAR(50) , -antragsteller_vorname VARCHAR(200) not null, -antragsteller_nachname VARCHAR(200) not null, -antragsteller_email VARCHAR(200) not null, -antragsteller_benutzerkennung VARCHAR(200) not null, -antragsteller_einrichtung VARCHAR(200) not null, -antragsteller_funktion VARCHAR(200) not null, -antragsteller_funktion_gueltig_bis DATE , -vorgesetzter_titel VARCHAR(200) , -vorgesetzter_vorname VARCHAR(200) not null, -vorgesetzter_nachname VARCHAR(200) not null, -vorgesetzter_email VARCHAR(200) not null, -daten_bewerber_zulassung SMALLINT not null, -daten_stud_absolv SMALLINT not null, -daten_personal_stellen SMALLINT not null, -daten_finanzen SMALLINT not null, -antragsart VARCHAR(100) not null, -fin_personal_projekt VARCHAR(100) , -antragsdatum DATE not null, -antragsempfaenger VARCHAR(200) not null, -antrag_email1adresse VARCHAR(200) , -antrag_email1_versendet timestamptz , -genehmigung1_userid INTEGER , -genehmigung1_zeitpunkt timestamptz , -genehmigung1_titel VARCHAR(100) , -genehmigung1_vorname VARCHAR(200) , -genehmigung1_nachname VARCHAR(200) , -genehmigung1_email_versendet timestamptz , -genehmigung2_userid INTEGER , -genehmigung2_zeitpunkt timestamptz , -genehmigung2_notiz VARCHAR(2147483647) , -uuid VARCHAR(255) , -genehmigung2_email_versendet timestamptz , - constraint user_antrag_pkey primary key (tid) - -) -; - - - -comment on column user_antrag.tid is 'Antrag ID'; - -comment on column user_antrag.antragsteller_titel is 'Antragsteller Titel'; - -comment on column user_antrag.antragsteller_vorname is 'Antragsteller Vorname'; - -comment on column user_antrag.antragsteller_nachname is 'Antragsteller Nachname'; - -comment on column user_antrag.antragsteller_email is 'Antragsteller E-Mail'; - -comment on column user_antrag.antragsteller_benutzerkennung is 'Benutzerkennung'; - -comment on column user_antrag.antragsteller_einrichtung is 'Einrichtung'; - -comment on column user_antrag.antragsteller_funktion is 'Funktion'; - -comment on column user_antrag.antragsteller_funktion_gueltig_bis is 'Funktion gültig bis'; - -comment on column user_antrag.vorgesetzter_titel is 'Vorgesetzter Titel'; - -comment on column user_antrag.vorgesetzter_vorname is 'Vorgesetzter Vorname'; - -comment on column user_antrag.vorgesetzter_nachname is 'Vorgesetzter Nachname'; - -comment on column user_antrag.vorgesetzter_email is 'Vorgesetzter E-Mail'; - -comment on column user_antrag.daten_bewerber_zulassung is 'Beantragter Datenzugriff Bewerbungen'; - -comment on column user_antrag.daten_stud_absolv is 'Beantragter Datenzugriff Studierende'; - -comment on column user_antrag.daten_personal_stellen is 'Beantragter Datenzugriff Personal'; - -comment on column user_antrag.daten_finanzen is 'Beantragter Datenzugriff Finanzen'; - -comment on column user_antrag.antragsart is 'Antragsart'; - -comment on column user_antrag.fin_personal_projekt is 'Projekt'; - -comment on column user_antrag.antragsdatum is 'Antragsdatum'; - -comment on column user_antrag.antragsempfaenger is 'Antragsempfänger'; - -comment on column user_antrag.antrag_email1adresse is 'Antragsempfänger E-Mail'; - -comment on column user_antrag.antrag_email1_versendet is 'Antragsempfänger Email versendet am'; - -comment on column user_antrag.genehmigung1_userid is 'Genehmigung 1 von'; - -comment on column user_antrag.genehmigung1_zeitpunkt is 'Genehmigung 1 Zeitpunkt'; - -comment on column user_antrag.genehmigung1_titel is 'Genehmigung 1 Titel'; - -comment on column user_antrag.genehmigung1_vorname is 'Genehmigung 1 Vorname'; - -comment on column user_antrag.genehmigung1_nachname is 'Genehmigung 1 Nachname'; - -comment on column user_antrag.genehmigung1_email_versendet is 'Genehmigung 1 Email versendet am'; - -comment on column user_antrag.genehmigung2_userid is 'Genehmigung 2 von'; - -comment on column user_antrag.genehmigung2_zeitpunkt is 'Genehmigung 2 Zeitpunkt'; - -comment on column user_antrag.genehmigung2_notiz is 'Genehmigung 2 Notiz'; - -comment on column user_antrag.uuid is 'UUID'; - -comment on column user_antrag.genehmigung2_email_versendet is 'Genehmigung 2 Email versendet'; - - -delete from db_tabellen where name='user_antrag'; -insert into db_tabellen (name,protokollierung) values('user_antrag',0); - -<#if !deleted_tables?seq_contains("user_antrag_kostenstellen") && tables?is_sequence && tables?seq_contains("user_antrag_kostenstellen") > - - -select now(), 'table user_antrag_kostenstellen exists - fine'; - - -<#else> - - -select now(), 'Erzeuge Tabelle user_antrag_kostenstellen'; - -create table user_antrag_kostenstellen( - tid SERIAL not null, -antrag_id INTEGER not null, -kostenstelle CHAR(10) not null, - constraint user_antrag_kostenstellen_pkey primary key (tid) - -) -; - - - -comment on column user_antrag_kostenstellen.tid is 'Laufnummer'; - -comment on column user_antrag_kostenstellen.antrag_id is 'Antrag'; - -comment on column user_antrag_kostenstellen.kostenstelle is 'Kostenstelle'; - - -delete from db_tabellen where name='user_antrag_kostenstellen'; -insert into db_tabellen (name,protokollierung) values('user_antrag_kostenstellen',0); - <#if !deleted_tables?seq_contains("kern_cifx_neu") && tables?is_sequence && tables?seq_contains("kern_cifx_neu") > @@ -6227,10 +6066,6 @@ alter table if exists user_portlet_bez drop constraint if exists user_portlet_be alter table if exists user_portlet_bez drop constraint if exists c_user_portlet_bez; alter table if exists group_portlet_bez drop constraint if exists group_portlet_bez_pkey; alter table if exists group_portlet_bez drop constraint if exists c_group_portlet_bez; -alter table if exists user_antrag drop constraint if exists user_antrag_pkey; -alter table if exists user_antrag drop constraint if exists user_antrag_pkey; -alter table if exists user_antrag_kostenstellen drop constraint if exists user_antrag_kostenstellen_pkey; -alter table if exists user_antrag_kostenstellen drop constraint if exists user_antrag_kostenstellen_pkey; alter table if exists sieve drop constraint if exists sieve_pkey; alter table if exists sieve drop constraint if exists ix_sieve; alter table if exists sieve_column_def drop constraint if exists sieve_column_def_pkey; @@ -6348,8 +6183,6 @@ alter table if exists user_preset_values add constraint user_preset_values_pkey alter table if exists sx_portlet add constraint sx_portlet_pkey primary key (tid); alter table if exists user_portlet_bez add constraint user_portlet_bez_pkey primary key (portlet_id,userinfo_id); alter table if exists group_portlet_bez add constraint group_portlet_bez_pkey primary key (portlet_id,groupinfo_id); -alter table if exists user_antrag add constraint user_antrag_pkey primary key (tid); -alter table if exists user_antrag_kostenstellen add constraint user_antrag_kostenstellen_pkey primary key (tid); alter table if exists sieve add constraint sieve_pkey primary key (tid); alter table if exists sieve_column_def add constraint sieve_column_def_pkey primary key (tid); alter table if exists sieve_column add constraint sieve_column_pkey primary key (tid); diff --git a/superx/WEB-INF/kern_dbforms-config_pg.xml b/superx/WEB-INF/kern_dbforms-config_pg.xml index fe304ad..7016571 100644 --- a/superx/WEB-INF/kern_dbforms-config_pg.xml +++ b/superx/WEB-INF/kern_dbforms-config_pg.xml @@ -87,7 +87,7 @@ - + @@ -176,13 +176,13 @@ 1=ja, Verarbeitung bestätigt (per mail an submission_email und processor_email) - + - + - + @@ -441,7 +441,7 @@ - + @@ -475,10 +475,10 @@ - + - + @@ -760,10 +760,10 @@ - + - + @@ -872,10 +872,10 @@ - + - + @@ -886,10 +886,10 @@ - + - + @@ -1105,7 +1105,7 @@
        SuperX-Version2
        Modulversion5.4bModulversion5.3
        SachgebietAdministration id 0
        - + @@ -1113,10 +1113,10 @@
        - + - + @@ -1286,14 +1286,14 @@ - + - + - + @@ -1314,10 +1314,10 @@ - + - + @@ -1352,7 +1352,7 @@ - + @@ -1403,7 +1403,7 @@ - + @@ -1477,19 +1477,19 @@ - + - + - + - + @@ -1520,7 +1520,7 @@ - + @@ -1669,7 +1669,7 @@ - + @@ -1690,10 +1690,10 @@ - + - + @@ -1712,7 +1712,7 @@ - + @@ -1745,61 +1745,6 @@
        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        - - - - - - - - - - - -
        @@ -3172,14 +3117,6 @@ mode="full"> - -
        -In diesem Formular können Sie Anträge verwalten. - -tid - - - diff --git a/superx/edit/kern/cifx_customize_edit.jsp b/superx/edit/kern/cifx_customize_edit.jsp index 56724c3..bc4ffd3 100644 --- a/superx/edit/kern/cifx_customize_edit.jsp +++ b/superx/edit/kern/cifx_customize_edit.jsp @@ -185,7 +185,3 @@ dbConnectionName="<%= mandantenid %>" >" >         @@ -185,7 +185,7 @@ dbConnectionName="<%= mandantenid %>" > @@ -194,7 +194,7 @@ dbConnectionName="<%= mandantenid %>" > diff --git a/superx/edit/kern/group_field_pref_edit.jsp b/superx/edit/kern/group_field_pref_edit.jsp index 8f50843..681eb40 100644 --- a/superx/edit/kern/group_field_pref_edit.jsp +++ b/superx/edit/kern/group_field_pref_edit.jsp @@ -117,7 +117,7 @@ dbConnectionName="<%= mandantenid %>" > @@ -126,7 +126,7 @@ dbConnectionName="<%= mandantenid %>" ><%@ include file="/edit/kern/group_field_pref_edit_hidden.inc" %>
        -<% sql = "select name, name from sx_tables order by name;"; %> +<% sql = "select name, name from sx_tables order by name;"; %>
        -<% sql = "select key_apnr::char(10), trim(key_apnr) || '-' || trim(name) from organigramm order by trim(key_apnr) || '-' || trim(name);"; %> +<% sql = "select key_apnr::char(10), trim(key_apnr) || '-' || trim(name) from organigramm order by trim(key_apnr) || '-' || trim(name);"; %>
        -<% sql = "select tid, name from userinfo order by name;"; %> +<% sql = "select tid, name from userinfo order by name;"; %>
        Person, die den Download eingereicht hat
        -<% sql = "select tid, trim(name) from groupinfo order by trim(name);"; %> +<% sql = "select tid, trim(name) from groupinfo order by trim(name);"; %>
        -<% sql = "select tid, tid || ' - ' || trim(name) from felderinfo order by tid || ' - ' || trim(name);"; %> +<% sql = "select tid, tid || ' - ' || trim(name) from felderinfo order by tid || ' - ' || trim(name);"; %>
        diff --git a/superx/edit/kern/group_field_pref_list.jsp b/superx/edit/kern/group_field_pref_list.jsp index bb44d4b..279e7fd 100644 --- a/superx/edit/kern/group_field_pref_list.jsp +++ b/superx/edit/kern/group_field_pref_list.jsp @@ -92,7 +92,7 @@ dbConnectionName="<%= mandantenid %>" >