gitarre

diff --git a/Mitgliederverwaltung/AWK/DataTypes/.dummy b/Mitgliederverwaltung/AWK/DataTypes/.dummy
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/Mitgliederverwaltung/AWK/impl/GenadData.php b/Mitgliederverwaltung/AWK/impl/GenadData.php
index ae938b379efc4a30187e18feb5c2d58465e3ffab..7242fb252a230f23a7bb8357ecb7bfdab7efea33 100644 (file)
--- a/Mitgliederverwaltung/AWK/impl/GenadData.php
+++ b/Mitgliederverwaltung/AWK/impl/GenadData.php
@@ -6,13 +6,13 @@ require_once 'GenericAdmin/DataTypes/AttrProperty.php';
        // Generic Administration configuration data
        $mocd_tab = array (
                1 => array (
        // Generic Administration configuration data
        $mocd_tab = array (
                1 => array (

-                       'intern' => 'stamm',
+                       'intern' => 'Stamm',

                        'extern' => 'Personenstamm'),
                2 => array (
                        'extern' => 'Personenstamm'),
                2 => array (

-                       'intern' => 'grundstuck',
+                       'intern' => 'Grundstuck',

                        'extern' => 'Grundstück'),
                3 => array (
                        'extern' => 'Grundstück'),
                3 => array (

-                       'intern' => 'beitrage',
+                       'intern' => 'Beitrage',

                        'extern' => 'Beiträge'),
 //             4 => array (
 //                     'intern' => 'Werkzeug',
                        'extern' => 'Beiträge'),
 //             4 => array (
 //                     'intern' => 'Werkzeug',


@@ -21,108 +21,110 @@ require_once 'GenericAdmin/DataTypes/AttrProperty.php';
 
        $atdc_tab = array (
 
 
        $atdc_tab = array (
 

-               // Krimi
-               array (
-                       'intern'  => 'autor',
-                       'extern'  => 'Autor',
-                       'moc'     => 'Krimi',
-                       'props'   => array (AttrProperty::AP_GET)),
-               array (
-                       'intern'  => 'titel',
-                       'extern'  => 'Titel',
-                       'moc'     => 'Krimi',
-                       'props'   => array (AttrProperty::AP_GET)),
-               array (
-                       'intern'  => 'eigentumer',
-                       'extern'  => 'Eigentümer',
-                       'moc'     => 'Krimi',
-                       'props'   => array (AttrProperty::AP_GET)),
-               array (
-                       'intern'  => 'zz_bei',
-                       'extern'  => 'zur_Zeit_bei',
-                       'moc'     => 'Krimi',
+           // Personenstamm
+               array (
+                       'intern'  => 'nachname',
+                       'extern'  => 'Nachname',
+                       'moc'     => 'Stamm',
+                   'props'   => array (AttrProperty::AP_GET, AttrProperty::AP_SET)),
+               array (
+                       'intern'  => 'vorname',
+                       'extern'  => 'Vorname',
+                       'moc'     => 'Stamm',
+                   'props'   => array (AttrProperty::AP_GET, AttrProperty::AP_SET)),
+               array (
+                       'intern'  => 'stasse',
+                       'extern'  => 'Straße',
+                       'moc'     => 'Stamm',
+                   'props'   => array (AttrProperty::AP_GET, AttrProperty::AP_SET)),
+               array (
+                       'intern'  => 'plz',
+                       'extern'  => 'PLZ',
+                       'moc'     => 'Stamm',

                        'props'   => array (AttrProperty::AP_GET, AttrProperty::AP_SET)),
                array (
                        'props'   => array (AttrProperty::AP_GET, AttrProperty::AP_SET)),
                array (

-                       'intern'  => 'kommentar',
-                       'extern'  => 'Kommentar',
-                       'moc'     => 'Krimi',
+                       'intern'  => 'ort',
+                       'extern'  => 'Ort',
+                       'moc'     => 'Stamm',

                        'props'   => array (AttrProperty::AP_GET, AttrProperty::AP_SET)),
                        'props'   => array (AttrProperty::AP_GET, AttrProperty::AP_SET)),

-
-               // Hörbuch
-               array (
-                       'intern'  => 'autor',
-                       'extern'  => 'Autor',
-                       'moc'     => 'Horbuch',
-                       'props'   => array (AttrProperty::AP_GET)),
-               array (
-                       'intern'  => 'titel',
-                       'extern'  => 'Titel',
-                       'moc'     => 'Horbuch',
-                       'props'   => array (AttrProperty::AP_GET)),
-               array (
-                       'intern'  => 'eigentumer',
-                       'extern'  => 'Eigentümer',
-                       'moc'     => 'Horbuch',
-                       'props'   => array (AttrProperty::AP_GET)),
-               array (
-                       'intern'  => 'zz_bei',
-                       'extern'  => 'zur_Zeit_bei',
-                       'moc'     => 'Horbuch',
-                       'props'   => array (AttrProperty::AP_GET, AttrProperty::AP_SET)),
-               array (
-                       'intern'  => 'kommentar',
-                       'extern'  => 'Kommentar',
-                       'moc'     => 'Horbuch',
-                       'props'   => array (AttrProperty::AP_GET, AttrProperty::AP_SET)),
-
-               // Roman
-               array (
-                       'intern'  => 'autor',
-                       'extern'  => 'Autor',
-                       'moc'     => 'Roman',
-                       'props'   => array (AttrProperty::AP_GET)),
-               array (
-                       'intern'  => 'titel',
-                       'extern'  => 'Titel',
-                       'moc'     => 'Roman',
-                       'props'   => array (AttrProperty::AP_GET)),
-               array (
-                       'intern'  => 'eigentumer',
-                       'extern'  => 'Eigentümer',
-                       'moc'     => 'Roman',
-                       'props'   => array (AttrProperty::AP_GET)),
-               array (
-                       'intern'  => 'zz_bei',
-                       'extern'  => 'zur_Zeit_bei',
-                       'moc'     => 'Roman',
-                       'props'   => array (AttrProperty::AP_GET, AttrProperty::AP_SET)),
-               array (
-                       'intern'  => 'kommentar',
-                       'extern'  => 'Kommentar',
-                       'moc'     => 'Roman',
-                       'props'   => array (AttrProperty::AP_GET, AttrProperty::AP_SET)),
-
-               // Werkzeug
-               array (
-                       'intern'  => 'typ',
-                       'extern'  => 'Typ',
-                       'moc'     => 'Werkzeug',
-                       'props'   => array (AttrProperty::AP_GET)),
-               array (
-                       'intern'  => 'beschreibung',
-                       'extern'  => 'Beschreibung',
-                       'moc'     => 'Werkzeug',
-                       'props'   => array (AttrProperty::AP_GET)),
-               array (
-                       'intern'  => 'eigentumer',
-                       'extern'  => 'Eigentümer',
-                       'moc'     => 'Werkzeug',
-                       'props'   => array (AttrProperty::AP_GET)),
-               array (
-                       'intern'  => 'zz_bei',
-                       'extern'  => 'zur_Zeit_bei',
-                       'moc'     => 'Werkzeug',
-                       'props'   => array (AttrProperty::AP_GET, AttrProperty::AP_SET))
+           array (
+               'intern'  => 'zahlweise',
+               'extern'  => 'Zahlweise',
+               'moc'     => 'Stamm',
+               'props'   => array (AttrProperty::AP_GET, AttrProperty::AP_SET),
+               'typ_cl'  => 'Zahlweise'),
+           array (
+               'intern'  => 'iban',
+               'extern'  => 'IBAN',
+               'moc'     => 'Stamm',
+               'props'   => array (AttrProperty::AP_GET, AttrProperty::AP_SET)),
+           array (
+               'intern'  => 'bic',
+               'extern'  => 'BIC',
+               'moc'     => 'Stamm',
+               'props'   => array (AttrProperty::AP_GET, AttrProperty::AP_SET)),
+           array (
+               'intern'  => 'kommentar',
+               'extern'  => 'Kommentar',
+               'moc'     => 'Stamm',
+               'props'   => array (AttrProperty::AP_GET, AttrProperty::AP_SET)),
+           array (
+               'intern'  => 'Grundstuck',
+               'extern'  => 'Versicherte_Grundstücke',
+               'moc'     => 'Stamm',
+               'props'   => array (AttrProperty::AP_GET, AttrProperty::AP_SET, AttrProperty::AP_LIST, AttrProperty::AP_REL),
+               'rel_moc' => 2), //Grundstücke
+           array (
+               'intern'  => 'Beitrag',
+               'extern'  => 'Zahlungen',
+               'moc'     => 'Stamm',
+               'props'   => array (AttrProperty::AP_GET, AttrProperty::AP_SET, AttrProperty::AP_LIST, AttrProperty::AP_REL),
+               'rel_moc' => 3), //Zahlungen
+           
+           // Grundstück
+               array (
+                       'intern'  => 'wie_anschrift',
+                       'extern'  => 'wie_Anschrift',
+                       'moc'     => 'Grundstuck',
+                   'props'   => array (AttrProperty::AP_GET, AttrProperty::AP_SET, AttrProperty::AP_BOOL)),
+           array (
+               'intern'  => 'strasse',
+               'extern'  => 'Straße',
+               'moc'     => 'Grundstuck',
+               'props'   => array (AttrProperty::AP_GET, AttrProperty::AP_SET)),
+           array (
+               'intern'  => 'plz',
+               'extern'  => 'PLZ',
+               'moc'     => 'Grundstuck',
+               'props'   => array (AttrProperty::AP_GET, AttrProperty::AP_SET)),
+           array (
+               'intern'  => 'ort',
+               'extern'  => 'Ort',
+               'moc'     => 'Grundstuck',
+               'props'   => array (AttrProperty::AP_GET, AttrProperty::AP_SET)),
+           array (
+               'intern'  => 'kommentar',
+               'extern'  => 'Kommentar',
+               'moc'     => 'Grundstuck',
+               'props'   => array (AttrProperty::AP_GET, AttrProperty::AP_SET)),
+           
+           // Beiträge
+               array (
+                       'intern'  => 'jahr',
+                       'extern'  => 'Jahr',
+                       'moc'     => 'Beitrage',
+                   'props'   => array (AttrProperty::AP_GET, AttrProperty::AP_INT)),
+           array (
+               'intern'  => 'zahlweise',
+               'extern'  => 'Zahlweise',
+               'moc'     => 'Beitrage',
+               'props'   => array (AttrProperty::AP_GET),
+               'typ_cl'  => 'Zahlweise'),
+           array (
+               'intern'  => 'kommentar',
+               'extern'  => 'Kommentar',
+               'moc'     => 'Beitrage',
+               'props'   => array (AttrProperty::AP_GET, AttrProperty::AP_SET)),

                );
 
 ?>
                );
 
 ?>

diff --git a/Mitgliederverwaltung/AWK/impl/data/runtime-conf.xml b/Mitgliederverwaltung/AWK/impl/data/runtime-conf.xml
index 25eec8fcfb1749a6e3dfa928ba1aaef71147ae98..c8ef64ab4aeb6438fae14af14700e75690a6cb56 100644 (file)
--- a/Mitgliederverwaltung/AWK/impl/data/runtime-conf.xml
+++ b/Mitgliederverwaltung/AWK/impl/data/runtime-conf.xml
@@ -8,13 +8,13 @@
     <level>7</level>
   </log-->
   <propel>
     <level>7</level>
   </log-->
   <propel>

-    <datasources default="mkrimi">
-      <datasource id="mkrimi">
+    <datasources default="svbal">
+      <datasource id="svbal">

         <adapter>mysql</adapter> <!-- sqlite, mysql, myssql, oracle, or pgsql -->
         <connection>
         <adapter>mysql</adapter> <!-- sqlite, mysql, myssql, oracle, or pgsql -->
         <connection>

-          <dsn>mysql:host=localhost;dbname=mkrimi</dsn>
-          <user>mkrimi</user>
-          <password>mkrimi</password>
+          <dsn>mysql:host=localhost;dbname=svbal</dsn>
+          <user>SVBaL</user>
+          <password>SVBaL</password>

           <settings>
             <setting id="charset">utf8</setting>
           </settings>
           <settings>
             <setting id="charset">utf8</setting>
           </settings>

diff --git a/Mitgliederverwaltung/AWK/impl/data/schema.xml b/Mitgliederverwaltung/AWK/impl/data/schema.xml
index 8053f2ed9143248bfae742ea92f05d6e5eb7728b..48b7a8cbb7a4af8cd7439c17ee56fa2617bd8ee3 100644 (file)
--- a/Mitgliederverwaltung/AWK/impl/data/schema.xml
+++ b/Mitgliederverwaltung/AWK/impl/data/schema.xml
@@ -1,25 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<database name="mkrimi" defaultIdMethod="native">
-       <table name="medium">
+<database name="svbal" defaultIdMethod="native">
+       <table name="stamm">

                <column name="id" type="integer" required="true" primaryKey="true" autoIncrement="true"/>
                <column name="mod" type="integer" required="true"/>
                <column name="id" type="integer" required="true" primaryKey="true" autoIncrement="true"/>
                <column name="mod" type="integer" required="true"/>

-               <column name="autor" type="varchar" size="100" required="true"/>
-               <column name="titel" type="varchar" size="100" required="true"/>
-               <column name="eigentumer" type="varchar" size="100" required="true"/>
-               <column name="zz_bei" type="varchar" size="100" required="true"/>
-               <column name="kommentar" type="varchar" size="100" required="true"/>
-               <column name="class_key" type="integer" required="true" inheritance="single">
-                       <inheritance key="1" class="Krimi" extends="Medium"/>
-                       <inheritance key="2" class="Horbuch" extends="Medium"/>
-                       <inheritance key="3" class="Roman" extends="Medium"/>
-               </column>
+               <column name="nachname" type="varchar" size="100" required="true"/>
+               <column name="vorname" type="varchar" size="100" required="true"/>
+               <column name="stasse" type="varchar" size="100" required="true"/>
+               <column name="plz" type="char" size="10" required="true"/>
+               <column name="ort" type="varchar" size="100" required="true"/>
+               <column name="zahlweise" type="integer" required="true"/>
+               <column name="iban" type="char" size="20" required="true"/>
+               <column name="bic" type="char" size="10" required="true"/>
+               <column name="kommentar" type="varchar" size="1000" required="true"/>

        </table>
        </table>

-       <table name="werkzeug">
+       <table name="grundstuck">

                <column name="id" type="integer" required="true" primaryKey="true" autoIncrement="true"/>
                <column name="mod" type="integer" required="true"/>
                <column name="id" type="integer" required="true" primaryKey="true" autoIncrement="true"/>
                <column name="mod" type="integer" required="true"/>

-               <column name="typ" type="varchar" size="100" required="true"/>
-               <column name="beschreibung" type="varchar" size="100" required="true"/>
-               <column name="eigentumer" type="varchar" size="100" required="true"/>
-               <column name="zz_bei" type="varchar" size="100" required="true"/>
+               <column name="wie_anschrift" type="integer" required="true"/>
+               <column name="strasse" type="varchar" size="100" required="true"/>
+               <column name="plz" type="char" size="10" required="true"/>
+               <column name="ort" type="varchar" size="100" required="true"/>
+               <column name="kommentar" type="varchar" size="1000" required="true"/>
+               <column name="stamm_id" type="integer" required="true"/>
+               <foreign-key foreignTable="stamm" refPhpName="Grundstuck">
+                       <reference local="stamm_id" foreign="id"/>
+               </foreign-key>
+       </table>
+       <table name="beitrage">
+               <column name="id" type="integer" required="true" primaryKey="true" autoIncrement="true"/>
+               <column name="mod" type="integer" required="true"/>
+               <column name="jahr" type="integer" required="true"/>
+               <column name="zahlweise" type="integer" required="true"/>
+               <column name="kommentar" type="varchar" size="1000" required="true"/>
+               <column name="stamm_id" type="integer" required="true"/>
+               <foreign-key foreignTable="stamm" refPhpName="Beitrag">
+                       <reference local="stamm_id" foreign="id"/>
+               </foreign-key>

        </table>
 </database>
        </table>
 </database>