added tbl_bisio.herkunftsland_code in db and made it editable as IO data in FAS

2026-07-22 01:12:17 +00:00 · 2022-07-14 19:50:50 +02:00
parent 8a813e0a2c
commit 043f444bb6
6 changed files with 45 additions and 4 deletions
@@ -3126,6 +3126,7 @@ if(!$error)
 			$bisio->bisio_id = (isset($_POST['bisio_id'])?$_POST['bisio_id']:'');
 			$bisio->mobilitaetsprogramm_code = $_POST['mobilitaetsprogramm_code'];
 			$bisio->nation_code = $_POST['nation_code'];
+			$bisio->herkunftsland_code = $_POST['herkunftsland_code'];
 			$bisio->von = $_POST['von'];
 			$bisio->bis = $_POST['bis'];
 			$bisio->student_uid = $_POST['student_uid'];
@@ -171,6 +171,20 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 											</template>
 										</menulist>
 									</row>
+									<row>
+										<label value="Herkunftsland" control="student-io-menulist-herkunftsland"/>
+										<menulist id="student-io-menulist-herkunftsland" disabled="true"
+												  datasources="<?php echo APP_ROOT ?>rdf/nation.rdf.php" flex="1"
+												  ref="http://www.technikum-wien.at/nation/liste" >
+											<template>
+												<menupopup>
+													<menuitem value="rdf:http://www.technikum-wien.at/nation/rdf#nation_code"
+															  label="rdf:http://www.technikum-wien.at/nation/rdf#kurztext"
+															  uri="rdf:*"/>
+													</menupopup>
+											</template>
+										</menulist>
+									</row>
 									<row>
 										<label value="Zweck" control="student-io-menulist-zweck"/>
 										<vbox>
@@ -3505,6 +3505,7 @@ function StudentIOAuswahl()

 	mobilitaetsprogramm_code = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#mobilitaetsprogramm_code" ));
 	nation_code = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#nation_code" ));
+	herkunftsland_code = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#herkunftsland_code" ));
 	von = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#von" ));
 	bis = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#bis" ));
 	zweck_code = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zweck_code" ));
@@ -3579,6 +3580,7 @@ function StudentIOAuswahl()

 	document.getElementById('student-io-menulist-mobilitaetsprogramm').value=mobilitaetsprogramm_code;
 	document.getElementById('student-io-menulist-nation').value=nation_code;
+	document.getElementById('student-io-menulist-herkunftsland').value=herkunftsland_code;
 	document.getElementById('student-io-textbox-von').value=von;
 	document.getElementById('student-io-textbox-bis').value=bis;
 	document.getElementById('student-io-detail-textbox-uid').value=student_uid;
@@ -3813,6 +3815,7 @@ function StudentIODetailDisableFields(val)
 	document.getElementById('student-io-textbox-bis').disabled=val;
 	document.getElementById('student-io-menulist-mobilitaetsprogramm').disabled=val;
 	document.getElementById('student-io-menulist-nation').disabled=val;
+	document.getElementById('student-io-menulist-herkunftsland').disabled=val;
 	document.getElementById('student-io-menulist-zweck').disabled=val;
 	document.getElementById('student-io-button-speichern').disabled=val;
 	document.getElementById('student-io-menulist-lehrveranstaltung').disabled=val;
@@ -3838,6 +3841,7 @@ function StudentIOResetFileds()
 	document.getElementById('student-io-menulist-mobilitaetsprogramm').value='7';
 	document.getElementById('student-io-menulist-zweck').value='2';
 	document.getElementById('student-io-menulist-nation').value='A';
+	document.getElementById('student-io-menulist-herkunftsland').value='A';
 	document.getElementById('student-io-textbox-ort').value='';
 	document.getElementById('student-io-textbox-universitaet').value='';
 	document.getElementById('student-io-textbox-ects_angerechnet').value='';
@@ -3855,6 +3859,7 @@ function StudentIODetailSpeichern()
 	bis = document.getElementById('student-io-textbox-bis').value;
 	mobilitaetsprogramm = document.getElementById('student-io-menulist-mobilitaetsprogramm').value;
 	nation_code = document.getElementById('student-io-menulist-nation').value;
+	herkunftsland_code = document.getElementById('student-io-menulist-herkunftsland').value;
 	zweck_code = document.getElementById('student-io-menulist-zweck').value;
 	uid = document.getElementById('student-io-detail-textbox-uid').value;
 	neu = document.getElementById('student-io-detail-checkbox-neu').checked;
@@ -3892,6 +3897,7 @@ function StudentIODetailSpeichern()
 	req.add('bis', ConvertDateToISO(bis));
 	req.add('mobilitaetsprogramm_code', mobilitaetsprogramm);
 	req.add('nation_code', nation_code);
+	req.add('herkunftsland_code', herkunftsland_code);
 	req.add('zweck_code', zweck_code);
 	req.add('student_uid', uid);
 	req.add('studiengang_kz', studiengang_kz);
@@ -4029,6 +4035,7 @@ function StudentIONeu()
 	req.add('bis', ConvertDateToISO(defaultdatum));
 	req.add('mobilitaetsprogramm_code', mobilitaetsprogramm);
 	req.add('nation_code', 'A');
+	req.add('herkunftsland_code', 'A');
 	req.add('student_uid', uid);
 	req.add('studiengang_kz', stg_kz);
 	req.add('lehreinheit_id', '');
@@ -49,6 +49,7 @@ class bisio extends basis_db
 	public $lehreinheit_id;				// integer
 	public $ects_erworben;				// numeric(5,2)
 	public $ects_angerechnet;			// numeric(5,2)
+	public $herkunftsland_code;			// varchar(3)

 	public $aufenthaltfoerderung_code;	// integer
 	public $bezeichnung;				// varchar(64)
@@ -100,6 +101,7 @@ class bisio extends basis_db
 				$this->lehreinheit_id = $row->lehreinheit_id;
 				$this->ects_angerechnet = $row->ects_angerechnet;
 				$this->ects_erworben = $row->ects_erworben;
+				$this->herkunftsland_code = $row->herkunftsland_code;

 				return true;
 			}
@@ -202,7 +204,7 @@ class bisio extends basis_db

 			$qry='BEGIN;INSERT INTO bis.tbl_bisio (mobilitaetsprogramm_code, nation_code, von, bis,
 				student_uid, updateamum, updatevon, insertamum, insertvon, ort, universitaet, lehreinheit_id,
-				ects_angerechnet, ects_erworben) VALUES('.
+				ects_angerechnet, ects_erworben, herkunftsland_code) VALUES('.
 			     $this->db_add_param($this->mobilitaetsprogramm_code, FHC_INTEGER).', '.
 			     $this->db_add_param($this->nation_code).', '.
 			     $this->db_add_param($this->von).', '.
@@ -216,7 +218,8 @@ class bisio extends basis_db
 			     $this->db_add_param($this->universitaet).', '.
 			     $this->db_add_param($this->lehreinheit_id, FHC_INTEGER).','.
 			     $this->db_add_param($this->ects_angerechnet).', '.
-			     $this->db_add_param($this->ects_erworben).');';
+			     $this->db_add_param($this->ects_erworben).', '.
+			     $this->db_add_param($this->herkunftsland_code).');';
 		}
 		else
 		{
@@ -233,7 +236,8 @@ class bisio extends basis_db
 				   ' universitaet='.$this->db_add_param($this->universitaet).','.
 				   ' lehreinheit_id='.$this->db_add_param($this->lehreinheit_id, FHC_INTEGER).', '.
 				   ' ects_angerechnet='.$this->db_add_param($this->ects_angerechnet).', '.
-				   ' ects_erworben='.$this->db_add_param($this->ects_erworben).
+				   ' ects_erworben='.$this->db_add_param($this->ects_erworben).', '.
+				   ' herkunftsland_code='.$this->db_add_param($this->herkunftsland_code).
 				   " WHERE bisio_id=".$this->db_add_param($this->bisio_id, FHC_INTEGER).";";
 		}

@@ -337,6 +341,7 @@ class bisio extends basis_db
 				$io->lehreinheit_id = $row->lehreinheit_id;
 				$io->ects_angerechnet = $row->ects_angerechnet;
 				$io->ects_erworben = $row->ects_erworben;
+				$io->herkunftsland_code = $row->herkunftsland_code;

 				$this->result[] = $io;
 			}
@@ -395,6 +400,7 @@ class bisio extends basis_db
 				$io->lehreinheit_id = $row->lehreinheit_id;
 				$io->ects_angerechnet = $row->ects_angerechnet;
 				$io->ects_erworben = $row->ects_erworben;
+				$io->herkunftsland_code = $row->herkunftsland_code;

 				$this->result[] = $io;
 			}
@@ -111,6 +111,7 @@ function draw_content($row)
 	            <IO:mobilitaetsprogramm_code><![CDATA['.$row->mobilitaetsprogramm_code.']]></IO:mobilitaetsprogramm_code>
 	            <IO:mobilitaetsprogramm_kurzbz><![CDATA['.$row->mobilitaetsprogramm_kurzbz.']]></IO:mobilitaetsprogramm_kurzbz>
 	            <IO:nation_code><![CDATA['.$row->nation_code.']]></IO:nation_code>
+	            <IO:herkunftsland_code><![CDATA['.$row->herkunftsland_code.']]></IO:herkunftsland_code>
 	            <IO:von_iso><![CDATA['.$row->von.']]></IO:von_iso>
 	            <IO:von><![CDATA['.$datum->convertISODate($row->von).']]></IO:von>
 	            <IO:bis_iso><![CDATA['.$row->bis.']]></IO:bis_iso>
@@ -6270,6 +6270,18 @@ if(!@$db->db_query("SELECT studienkennung_uni FROM bis.tbl_gsprogramm LIMIT 1"))
 		echo '<br>Spalte studienkennung_uni in bis.tbl_gsprogramm hinzugefügt';
 }

+// ADD COLUMN herkunftsland_code to bis.tbl_bisio
+if(!@$db->db_query("SELECT herkunftsland_code FROM bis.tbl_bisio LIMIT 1"))
+{
+	$qry = "ALTER TABLE bis.tbl_bisio ADD COLUMN herkunftsland_code varchar(3);
+			ALTER TABLE bis.tbl_bisio ADD CONSTRAINT fk_tbl_bisio_herkunftsland_code FOREIGN KEY (herkunftsland_code) REFERENCES bis.tbl_nation(nation_code) ON DELETE RESTRICT ON UPDATE CASCADE;";
+
+	if(!$db->db_query($qry))
+		echo '<strong>bis.tbl_bisio '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>Spalte herkunftsland_code in bis.tbl_bisio hinzugefügt';
+}
+
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';

@@ -6285,7 +6297,7 @@ $tabellen=array(
 	"bis.tbl_beschaeftigungsausmass"  => array("beschausmasscode","beschausmassbez","min","max"),
 	"bis.tbl_besqual"  => array("besqualcode","besqualbez"),
 	"bis.tbl_bisfunktion"  => array("bisverwendung_id","studiengang_kz","sws","updateamum","updatevon","insertamum","insertvon","ext_id"),
-	"bis.tbl_bisio"  => array("bisio_id","mobilitaetsprogramm_code","nation_code","von","bis","zweck_code","student_uid","updateamum","updatevon","insertamum","insertvon","ext_id","ort","universitaet","lehreinheit_id","ects_erworben","ects_angerechnet"),
+	"bis.tbl_bisio"  => array("bisio_id","mobilitaetsprogramm_code","nation_code","von","bis","zweck_code","student_uid","updateamum","updatevon","insertamum","insertvon","ext_id","ort","universitaet","lehreinheit_id","ects_erworben","ects_angerechnet","herkunftsland_code"),
 	"bis.tbl_bisio_zweck"  => array("bisio_id","zweck_code"),
 	"bis.tbl_bisstandort"  => array("standort_code","bezeichnung","aktiv","insertamum","insertvon","updateamum","updatevon"),
 	"bis.tbl_bisverwendung"  => array("bisverwendung_id","ba1code","ba2code","vertragsstunden","beschausmasscode","verwendung_code","mitarbeiter_uid","hauptberufcode","hauptberuflich","habilitation","beginn","ende","updateamum","updatevon","insertamum","insertvon","ext_id","dv_art","inkludierte_lehre","zeitaufzeichnungspflichtig","azgrelevant", "homeoffice"),