Added co_name to FAS Adressedialogue/-fields & to class Adresse

This new field co_name = Abweichender Empfaenger is required for
BIS Meldung.

Signed-off-by: Cris <hainberg@technikum-wien.at>

content/adressedialog.js.php

@@ -60,6 +60,7 @@ function AdresseInit(adresse_id, person_id)
 		typ = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#typ" ));
 		heimatadresse = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#heimatadresse" ));
 		zustelladresse = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zustelladresse" ));
+        co_name = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#co_name" ));
 		firma_id = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#firma_id" ));
 		rechnungsadresse = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#rechnungsadresse" ));
 		anmerkung = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#anmerkung" ));
@@ -78,6 +79,7 @@ function AdresseInit(adresse_id, person_id)
 		typ='h';
 		heimatadresse='Ja';
 		zustelladresse='Ja';
+        co_name = '';
 		firma_id='';
 		rechnungsadresse='Nein';
 		anmerkung='';
@@ -104,6 +106,7 @@ function AdresseInit(adresse_id, person_id)
 		document.getElementById('adresse-checkbox-zustelladresse').checked=true;
 	else
 		document.getElementById('adresse-checkbox-zustelladresse').checked=false;
+    document.getElementById('adresse-textbox-co_name').value = co_name;
 	document.getElementById('adresse-menulist-firma').value=firma_id;
 	document.getElementById('adresse-textbox-anmerkung').value=anmerkung;
 	if(rechnungsadresse=='Ja')

content/adressedialog.xul.php

@@ -156,6 +156,13 @@ else
    					<label value="Zustelladresse" control="adresse-checkbox-zustelladresse"/>
   					<checkbox id="adresse-checkbox-zustelladresse" checked="true"/>
 				</row>
+                <row>
+                    <label value="Abweichender Empfänger (c/o)" control="adresse-textbox-co_name"/>
+                    <hbox>
+                        <textbox id="adresse-textbox-co_name" maxlength="256" size="30"/>
+                        <spacer flex="1" />
+                    </hbox>
+                </row>
 				<row>
    					<label value="Rechnungsadresse" control="adresse-checkbox-rechnungsadresse"/>
   					<checkbox id="adresse-checkbox-rechnungsadresse" checked="true"/>

content/fasDBDML.php

@@ -104,6 +104,7 @@ if(!$error)
 			$adresse->typ = $_POST['typ'];
 			$adresse->heimatadresse = ($_POST['heimatadresse']=='true'?true:false);
 			$adresse->zustelladresse = ($_POST['zustelladresse']=='true'?true:false);
+			$adresse->co_name = $_POST['co_name'];
 			$adresse->firma_id = $_POST['firma_id'];
 			$adresse->updateamum = date('Y-m-d H:i:s');
 			$adresse->updatevon = $user;

content/kontakt.js.php

@@ -284,6 +284,7 @@ function KontaktAdresseSpeichern(dialog)
 	typ = dialog.getElementById('adresse-menulist-typ').value;
 	heimatadresse = dialog.getElementById('adresse-checkbox-heimatadresse').checked;
 	zustelladresse = dialog.getElementById('adresse-checkbox-zustelladresse').checked;
+    co_name = dialog.getElementById('adresse-textbox-co_name').value;
 	firma_id = dialog.getElementById('adresse-menulist-firma').value;
 	rechnungsadresse = dialog.getElementById('adresse-checkbox-rechnungsadresse').checked;
 	anmerkung = dialog.getElementById('adresse-textbox-anmerkung').value;
@@ -315,6 +316,7 @@ function KontaktAdresseSpeichern(dialog)
 	req.add('studiengang_kz', studiengang_kz);
 	req.add('rechnungsadresse', rechnungsadresse);
 	req.add('anmerkung', anmerkung);
+	req.add('co_name', co_name);
 
 	var response = req.executePOST();
 

content/kontakt.xul.php

@@ -99,6 +99,10 @@ $uid = get_uid();
 						class="sortDirectionIndicator"
 						sort="rdf:http://www.technikum-wien.at/adresse/rdf#zustelladresse" onclick="KontaktAdresseTreeSort()"/>
 					<splitter class="tree-splitter"/>
+                    <treecol id="kontakt-adressen-treecol-co_name" label="Abweich.Empf.(c/o)" flex="1" hidden="false"
+                             class="sortDirectionIndicator"
+                             sort="rdf:http://www.technikum-wien.at/adresse/rdf#co_name" onclick="KontaktAdresseTreeSort()"/>
+                    <splitter class="tree-splitter"/>
 					<treecol id="kontakt-adressen-treecol-firma_id" label="Firma_id" flex="1" hidden="true"
 						class="sortDirectionIndicator"
 						sort="rdf:http://www.technikum-wien.at/adresse/rdf#firma_id" onclick="KontaktAdresseTreeSort()"/>
@@ -146,6 +150,7 @@ $uid = get_uid();
 									<treecell label="rdf:http://www.technikum-wien.at/adresse/rdf#nation" />
 									<treecell label="rdf:http://www.technikum-wien.at/adresse/rdf#heimatadresse" />
 									<treecell label="rdf:http://www.technikum-wien.at/adresse/rdf#zustelladresse" />
+									<treecell label="rdf:http://www.technikum-wien.at/adresse/rdf#co_name" />
 									<treecell label="rdf:http://www.technikum-wien.at/adresse/rdf#firma_id" />
 									<treecell label="rdf:http://www.technikum-wien.at/adresse/rdf#adresse_id" />
 									<treecell label="rdf:http://www.technikum-wien.at/adresse/rdf#person_id" />

include/adresse.class.php

@@ -43,6 +43,7 @@ class adresse extends basis_db
 	public $typ;				//  string
 	public $heimatadresse;		//  boolean
 	public $zustelladresse;		//  boolean
+	public $coname;             //  string
 	public $firma_id;			//  integer
 	public $updateamum;			//  timestamp
 	public $updatevon;			//  string
@@ -99,6 +100,7 @@ class adresse extends basis_db
 			$this->person_id		= $row->person_id;
 			$this->plz				= $row->plz;
 			$this->strasse			= $row->strasse;
+			$this->co_name			= $row->co_name;
 			$this->typ				= $row->typ;
 			$this->updateamum		= $row->updateamum;
 			$this->updatevon		= $row->updatevon;
@@ -161,6 +163,7 @@ class adresse extends basis_db
 			$adr_obj->insertamum      = $row->insertamum;
 			$adr_obj->insertvon       = $row->insertvon;
 			$adr_obj->zustelladresse  = $this->db_parse_bool($row->zustelladresse);
+			$adr_obj->co_name		  = $row->co_name;
 			$adr_obj->rechnungsadresse 	= $this->db_parse_bool($row->rechnungsadresse);
 			$adr_obj->anmerkung 	  = $row->anmerkung;
 
@@ -217,6 +220,7 @@ class adresse extends basis_db
 			$adr_obj->insertamum      = $row->insertamum;
 			$adr_obj->insertvon       = $row->insertvon;
 			$adr_obj->zustelladresse  = $this->db_parse_bool($row->zustelladresse);
+			$adr_obj->co_name		  = $row->co_name;
 			$adr_obj->rechnungsadresse = $this->db_parse_bool($row->rechnungsadresse);
 			$adr_obj->anmerkung 	  = $row->anmerkung;
 
@@ -269,6 +273,12 @@ class adresse extends basis_db
 			return false;
 		}
 		
+		if(mb_strlen($this->co_name)>64)
+		{
+			$this->errormsg = 'Gemeinde darf nicht länger als 64 Zeichen sein';
+			return false;
+		}
+
 		$this->errormsg = '';
 		return true;
 	}
@@ -289,7 +299,7 @@ class adresse extends basis_db
 		{
 			//Neuen Datensatz einfuegen
 			$qry='BEGIN;INSERT INTO public.tbl_adresse (person_id, name, strasse, plz, typ, ort, nation, insertamum, insertvon,
-				gemeinde, heimatadresse, zustelladresse, firma_id, updateamum, updatevon, rechnungsadresse, anmerkung) VALUES('.
+				gemeinde, heimatadresse, zustelladresse, firma_id, updateamum, updatevon, rechnungsadresse, anmerkung, co_name) VALUES('.
 				$this->db_add_param($this->person_id, FHC_INTEGER).', '.
 				$this->db_add_param($this->name).', '.
 				$this->db_add_param($this->strasse).', '.
@@ -304,7 +314,8 @@ class adresse extends basis_db
 				$this->db_add_param($this->firma_id, FHC_INTEGER).', now(), '.
 				$this->db_add_param($this->updatevon).','.
 				$this->db_add_param($this->rechnungsadresse, FHC_BOOLEAN, false).','.
-				$this->db_add_param($this->anmerkung).');';
+				$this->db_add_param($this->anmerkung).','.
+				$this->db_add_param($this->co_name).');';
 		}
 		else
 		{
@@ -314,6 +325,7 @@ class adresse extends basis_db
 				$this->errormsg = 'adresse_id muss eine gueltige Zahl sein';
 				return false;
 			}
+			
 			$qry='UPDATE public.tbl_adresse SET'.
 				' person_id='.$this->db_add_param($this->person_id, FHC_INTEGER).', '.
 				' name='.$this->db_add_param($this->name).', '.
@@ -329,7 +341,8 @@ class adresse extends basis_db
 				' heimatadresse='.$this->db_add_param($this->heimatadresse, FHC_BOOLEAN, false).', '.
 				' zustelladresse='.$this->db_add_param($this->zustelladresse, FHC_BOOLEAN, false).', '.
 				' rechnungsadresse='.$this->db_add_param($this->rechnungsadresse, FHC_BOOLEAN, false).','.
-				' anmerkung='.$this->db_add_param($this->anmerkung).' '.
+				' anmerkung='.$this->db_add_param($this->anmerkung).', '.
+				' co_name='.$this->db_add_param($this->co_name).' '.
 				'WHERE adresse_id='.$this->db_add_param($this->adresse_id, FHC_INTEGER, false).';';
 		}
 
@@ -442,6 +455,7 @@ class adresse extends basis_db
 			$this->firma_id			= $row->firma_id;
 			$this->rechnungsadresse = $this->db_parse_bool($row->rechnungsadresse);
 			$this->anmerkung        = $row->anmerkung;
+			$this->co_name			= $row->co_name;
 		}
 		else
 		{
@@ -498,6 +512,7 @@ class adresse extends basis_db
 			$adr_obj->zustelladresse  = $this->db_parse_bool($row->zustelladresse);
 			$adr_obj->rechnungsadresse 	= $this->db_parse_bool($row->rechnungsadresse);
 			$adr_obj->anmerkung 	  = $row->anmerkung;
+			$adr_obj->co_name 	  = $row->co_name;
 
 			$this->result[] = $adr_obj;
 		}

rdf/adresse.rdf.php

@@ -112,6 +112,7 @@ function draw_rdf($row)
             <ADRESSE:typ_name><![CDATA['.$typ.']]></ADRESSE:typ_name>
             <ADRESSE:heimatadresse><![CDATA['.($row->heimatadresse?'Ja':'Nein').']]></ADRESSE:heimatadresse>
             <ADRESSE:zustelladresse><![CDATA['.($row->zustelladresse?'Ja':'Nein').']]></ADRESSE:zustelladresse>
+            <ADRESSE:co_name><![CDATA['. $row->co_name.']]></ADRESSE:co_name>
             <ADRESSE:firma_id><![CDATA['.$row->firma_id.']]></ADRESSE:firma_id>
             <ADRESSE:firma_name><![CDATA['.$firma_name.']]></ADRESSE:firma_name>
             <ADRESSE:updateamum><![CDATA['.date('d.m.Y H:i:s',strtotime($row->updateamum)).']]></ADRESSE:updateamum>