New columns in tbl_service

- Added columns design_uid, betrieb_uid and operativ_uid to tbl_service

cis/private/info/service_uebersicht.php

@@ -23,6 +23,7 @@ require_once('../../../include/service.class.php');
 require_once('../../../include/benutzerberechtigung.class.php');
 require_once('../../../include/datum.class.php');
 require_once('../../../include/phrasen.class.php');
+require_once('../../../include/person.class.php');
 
 $user = get_uid();
 $sprache = getSprache(); 
@@ -110,6 +111,9 @@ echo '<table class="tablesorter" id="myTable">
 			<th>'.$p->t("global/organisationseinheit").'</th>
 			<th>'.$p->t("global/bezeichnung").'</th>
 			<th>'.$p->t("services/leistung").'</th>
+			<th>'.$p->t("services/design").'</th>
+			<th>'.$p->t("services/betrieb").'</th>
+			<th>'.$p->t("services/operativ").'</th>
 			<th>'.$p->t("services/details").'</th>
 		</tr>
 	</thead>
@@ -119,10 +123,22 @@ foreach($service->result as $row)
 {
 	if ($row->content_id!='')
 	{
+		$person = new person();
+		$person->getPersonFromBenutzer($row->design_uid);
+		$design = $person->nachname.' '.$person->vorname;
+		$person = new person();
+		$person->getPersonFromBenutzer($row->betrieb_uid);
+		$betrieb = $person->nachname.' '.$person->vorname;
+		$person = new person();
+		$person->getPersonFromBenutzer($row->operativ_uid);
+		$operativ = $person->nachname.' '.$person->vorname;
 		echo '<tr>';
 		echo '<td>',$row->oe_kurzbz,'</td>';
 		echo '<td>'.($row->content_id!=''?'<a href="../../../cms/content.php?content_id='.$row->content_id.'">'.$row->bezeichnung.'</a>':$row->bezeichnung).'</td>';
 		echo '<td>',$row->beschreibung,'</td>';
+		echo '<td><nobr><a href="../profile/index.php?uid='.$row->design_uid.'">',$design,'</a></nobr></td>';
+		echo '<td><nobr><a href="../profile/index.php?uid='.$row->betrieb_uid.'">',$betrieb,'</a></nobr></td>';
+		echo '<td><nobr><a href="../profile/index.php?uid='.$row->operativ_uid.'">',$operativ,'</a></nobr></td>';
 		echo '<td>'.($row->content_id!=''?'<a href="../../../cms/content.php?content_id='.$row->content_id.'">Details</a>':'').'</td>';
 		echo '</tr>';
 	}

include/service.class.php

@@ -35,6 +35,9 @@ class service extends basis_db
 	public $ext_id;			// bigint
 	public $oe_kurzbz;		// varchar(32)
 	public $content_id;		// integer
+	public $design_uid;		// varchar(32)
+	public $betrieb_uid;	// varchar(32)
+	public $operativ_uid;	// varchar(32)
 
 	/**
 	 * Konstruktor - Laedt optional ein Service
@@ -75,6 +78,9 @@ class service extends basis_db
 				$this->ext_id = $row->ext_id;
 				$this->oe_kurzbz = $row->oe_kurzbz;
 				$this->content_id = $row->content_id;
+				$this->design_uid = $row->design_uid;
+				$this->betrieb_uid = $row->betrieb_uid;
+				$this->operativ_uid = $row->operativ_uid;
 
 				return true;
 			}
@@ -110,6 +116,9 @@ class service extends basis_db
 				$obj->ext_id = $row->ext_id;
 				$obj->oe_kurzbz = $row->oe_kurzbz;
 				$obj->content_id = $row->content_id;
+				$obj->design_uid = $row->design_uid;
+				$obj->betrieb_uid = $row->betrieb_uid;
+				$obj->operativ_uid = $row->operativ_uid;
 
 				$this->result[] = $obj;
 			}
@@ -147,6 +156,9 @@ class service extends basis_db
 				$obj->ext_id = $row->ext_id;
 				$obj->oe_kurzbz = $row->oe_kurzbz;
 				$obj->content_id = $row->content_id;
+				$obj->design_uid = $row->design_uid;
+				$obj->betrieb_uid = $row->betrieb_uid;
+				$obj->operativ_uid = $row->operativ_uid;
 
 				$this->result[] = $obj;
 			}
@@ -208,6 +220,9 @@ class service extends basis_db
 				$obj->oe_kurzbz = $row->oe_kurzbz;
 				$obj->anzahl = $row->count;
 				$obj->content_id = $row->content_id;
+				$obj->design_uid = $row->design_uid;
+				$obj->betrieb_uid = $row->betrieb_uid;
+				$obj->operativ_uid = $row->operativ_uid;
 
 				$this->result[] = $obj;
 			}
@@ -257,6 +272,9 @@ class service extends basis_db
 				$obj->ext_id = $row->ext_id;
 				$obj->oe_kurzbz = $row->oe_kurzbz;
 				$obj->content_id = $row->content_id;
+				$obj->design_uid = $row->design_uid;
+				$obj->betrieb_uid = $row->betrieb_uid;
+				$obj->operativ_uid = $row->operativ_uid;
 
 				$this->result[] = $obj;
 			}
@@ -307,6 +325,9 @@ class service extends basis_db
 				$obj->ext_id = $row->ext_id;
 				$obj->oe_kurzbz = $row->oe_kurzbz;
 				$obj->content_id = $row->content_id;
+				$obj->design_uid = $row->design_uid;
+				$obj->betrieb_uid = $row->betrieb_uid;
+				$obj->operativ_uid = $row->operativ_uid;
 
 				$this->result[] = $obj;
 			}
@@ -342,12 +363,15 @@ class service extends basis_db
 
 		if($new)
 		{
-			$qry = "BEGIN;INSERT INTO public.tbl_service (bezeichnung, beschreibung, oe_kurzbz, content_id)
+			$qry = "BEGIN;INSERT INTO public.tbl_service (bezeichnung, beschreibung, oe_kurzbz, content_id, design_uid, betrieb_uid, operativ_uid)
 					VALUES(".
 				$this->db_add_param($this->bezeichnung).','.
 				$this->db_add_param($this->beschreibung).','.
 				$this->db_add_param($this->oe_kurzbz).','.
-				$this->db_add_param($this->content_id).');';
+				$this->db_add_param($this->content_id).','.
+				$this->db_add_param($this->design_uid).','.
+				$this->db_add_param($this->betrieb_uid).','.
+				$this->db_add_param($this->operativ_uid).');';
 		}
 		else
 		{
@@ -355,7 +379,10 @@ class service extends basis_db
 				' bezeichnung = '.$this->db_add_param($this->bezeichnung).','.
 				' beschreibung = '.$this->db_add_param($this->beschreibung).','.
 				' oe_kurzbz = '.$this->db_add_param($this->oe_kurzbz).','.
-				' content_id = '.$this->db_add_param($this->content_id).
+				' content_id = '.$this->db_add_param($this->content_id).','.
+				' design_uid = '.$this->db_add_param($this->design_uid).','.
+				' betrieb_uid = '.$this->db_add_param($this->betrieb_uid).','.
+				' operativ_uid = '.$this->db_add_param($this->operativ_uid).
 				' WHERE service_id='.$this->db_add_param($this->service_id, FHC_INTEGER).';';
 		}
 

locale/de-AT/services.php

@@ -4,4 +4,7 @@ $this->phrasen['services/uebersichtUeberServicesOrganisationseinheiten']='Übers
 $this->phrasen['services/details']='Details';
 $this->phrasen['services/filtern']='Filtern';
 $this->phrasen['services/leistung']='Leistung';
+$this->phrasen['services/design']='Design';
+$this->phrasen['services/betrieb']='Betrieb';
+$this->phrasen['services/operativ']='Operativ';
 ?>

locale/en-US/services.php

@@ -4,4 +4,7 @@ $this->phrasen['services/uebersichtUeberServicesOrganisationseinheiten']='Overvi
 $this->phrasen['services/details']='Details';
 $this->phrasen['services/filtern']='Filter';
 $this->phrasen['services/leistung']='Service';
+$this->phrasen['services/design']='Design';
+$this->phrasen['services/betrieb']='Running';
+$this->phrasen['services/operativ']='Operating';
 ?>

system/dbupdate_3.3.php

@@ -372,6 +372,22 @@ if(!$result = @$db->db_query("SELECT onlinebewerbung_studienplan FROM lehre.tbl_
 			echo '<br>lehre.tbl_studienplan: Spalte onlinebewerbung_studienplan hinzugefuegt!<br>';
 }
 
+// Column design_uid, betrieb_uid and operativ_uid to tbl_service
+if(!$result = @$db->db_query("SELECT design_uid FROM public.tbl_service LIMIT 1;"))
+{
+	$qry = "ALTER TABLE public.tbl_service ADD COLUMN design_uid varchar(32);
+			ALTER TABLE public.tbl_service ADD COLUMN betrieb_uid varchar(32);
+			ALTER TABLE public.tbl_service ADD COLUMN operativ_uid varchar(32);
+			ALTER TABLE public.tbl_service ADD CONSTRAINT fk_tbl_service_design_uid FOREIGN KEY (design_uid) REFERENCES public.tbl_benutzer (uid) ON DELETE RESTRICT ON UPDATE CASCADE;
+			ALTER TABLE public.tbl_service ADD CONSTRAINT fk_tbl_service_betrieb_uid FOREIGN KEY (betrieb_uid) REFERENCES public.tbl_benutzer (uid) ON DELETE RESTRICT ON UPDATE CASCADE;
+			ALTER TABLE public.tbl_service ADD CONSTRAINT fk_tbl_service_operativ_uid FOREIGN KEY (operativ_uid) REFERENCES public.tbl_benutzer (uid) ON DELETE RESTRICT ON UPDATE CASCADE;";
+	
+	if(!$db->db_query($qry))
+		echo '<strong>public.tbl_service: '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>public.tbl_service: Spalten design_uid,betrieb_uid,operativ_uid hinzugefuegt!<br>';
+}
+
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
 
@@ -588,7 +604,7 @@ $tabellen=array(
 	"public.tbl_status"  => array("status_kurzbz","beschreibung","anmerkung","ext_id","bezeichnung_mehrsprachig"),
 	"public.tbl_status_grund" => array("statusgrund_id","status_kurzbz","aktiv","bezeichnung_mehrsprachig","beschreibung"),
 	"public.tbl_semesterwochen"  => array("semester","studiengang_kz","wochen"),
-	"public.tbl_service" => array("service_id", "bezeichnung","beschreibung","ext_id","oe_kurzbz","content_id"),
+	"public.tbl_service" => array("service_id", "bezeichnung","beschreibung","ext_id","oe_kurzbz","content_id","design_uid","betrieb_uid","operativ_uid"),
 	"public.tbl_sprache"  => array("sprache","locale","flagge","index","content","bezeichnung"),
 	"public.tbl_standort"  => array("standort_id","adresse_id","kurzbz","bezeichnung","insertvon","insertamum","updatevon","updateamum","ext_id", "firma_id","code"),
 	"public.tbl_statistik"  => array("statistik_kurzbz","bezeichnung","url","gruppe","sql","content_id","insertamum","insertvon","updateamum","updatevon","berechtigung_kurzbz","publish","preferences"),

vilesci/stammdaten/service_details.php

@@ -25,6 +25,7 @@ require_once('../../include/service.class.php');
 require_once('../../include/benutzerberechtigung.class.php');
 require_once('../../include/datum.class.php');
 require_once('../../include/organisationseinheit.class.php');
+require_once('../../include/benutzer.class.php');
 
 if (!$db = new basis_db())
 	die('Es konnte keine Verbindung zum Server aufgebaut werden.');
@@ -35,7 +36,7 @@ $rechte = new benutzerberechtigung();
 $rechte->getBerechtigungen($user);
 	
 if(!$rechte->isBerechtigt('basis/service'))
-	die('Sie haben keine Berechtigung fuer diese Seite');
+	die($rechte->errormsg);
 	
 $datum_obj = new datum();
 ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
@@ -45,6 +46,36 @@ $datum_obj = new datum();
 	<title>Service - Details</title>
 	<link rel="stylesheet" href="../../skin/fhcomplete.css" type="text/css">
 	<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">
+	<link href="../../skin/jquery-ui-1.9.2.custom.min.css" rel="stylesheet" type="text/css">
+	<script src="../../include/js/jquery1.9.min.js" type="text/javascript"></script>
+	
+	
+	<?php //echo include('../../include/meta/jquery.php'); ?>
+	
+	<script type="text/javascript">
+	$(document).ready(function()
+	{
+		$(".benutzer_uid").autocomplete({
+			source: "reihungstestverwaltung_autocomplete.php?autocomplete=kunde",
+			minLength:2,
+			response: function(event, ui)
+			{
+				//Value und Label fuer die Anzeige setzen
+				for(i in ui.content)
+				{
+					//ui.content[i].value=ui.content[i].uid;
+					ui.content[i].value=ui.content[i].uid;
+					ui.content[i].label=ui.content[i].vorname+" "+ui.content[i].nachname+" ("+ui.content[i].uid+")";
+				}
+			},
+			select: function(event, ui)
+			{
+				//Ausgeaehlte Ressource zuweisen und Textfeld wieder leeren
+				$(this.id).val(ui.item.uid);
+			}
+		});
+	});
+	</script>
 </head>
 <body>
 
@@ -55,10 +86,14 @@ $datum_obj = new datum();
 	
 	if($action=='save')
 	{
+		$error = false;
 		$bezeichnung = (isset($_POST['bezeichnung'])?$_POST['bezeichnung']:die('Bezeichnung fehlt'));
 		$beschreibung = (isset($_POST['beschreibung'])?$_POST['beschreibung']:die('Beschreibung fehlt'));
 		$oe_kurzbz = (isset($_POST['oe_kurzbz'])?$_POST['oe_kurzbz']:die('Organisationseinheit fehlt'));
 		$content_id = (isset($_POST['content_id'])?$_POST['content_id']:die('Content_id fehlt'));
+		$design_uid = (isset($_POST['design_uid'])?$_POST['design_uid']:'');
+		$betrieb_uid = (isset($_POST['betrieb_uid'])?$_POST['betrieb_uid']:'');
+		$operativ_uid = (isset($_POST['operativ_uid'])?$_POST['operativ_uid']:'');
 		$ext_id = (isset($_POST['ext_id'])?$_POST['ext_id']:die('ext_id fehlt'));
 		$new = (isset($_POST['new'])?$_POST['new']:'true');
 		if($new=='true')
@@ -70,28 +105,59 @@ $datum_obj = new datum();
 			if(!$service->load($service_id))
 				die($service->errormsg);
 				
-			$service->new=false;
+			$service->new = false;
 		}
 		
-		$service->bezeichnung=$bezeichnung;
+		$service->bezeichnung = $bezeichnung;
 		$service->beschreibung = $beschreibung;
 		$service->ext_id = $ext_id;
 		$service->oe_kurzbz = $oe_kurzbz;
 		$service->content_id = $content_id;
 		
-		if($service->save())
-		{		
-			echo '<span class="ok">Daten erfolgreich gespeichert</span>';
-			echo "<script type='text/javascript'>\n";
-			echo "	parent.uebersicht_service.location.href='service_uebersicht.php?oe_kurzbz=$oe_kurzbz';";
-			echo "</script>\n";
-			$action='update';
-			$service_id = $service->service_id;
-		}
-		else
+		if ($design_uid != '' || $betrieb_uid != '' || $operativ_uid != '')
 		{
-			$action='new';
-			echo '<span class="error">'.$service->errormsg.'</span>';
+			$benutzer = new benutzer();
+			if ($design_uid != '' && !$benutzer->load($design_uid))
+			{
+				echo '<span class="error">Benutzer '.$design_uid.' ist nicht vorhanden</span>';
+				$error = true;
+			}
+			if ($betrieb_uid != '' && !$benutzer->load($betrieb_uid))
+			{
+				echo '<span class="error">Benutzer '.$betrieb_uid.' ist nicht vorhanden</span>';
+				$error = true;
+			}
+			if ($operativ_uid != '' && !$benutzer->load($operativ_uid))
+			{
+				echo '<span class="error">Benutzer '.$operativ_uid.' ist nicht vorhanden</span>';
+				$error = true;
+			}
+		}
+		
+		$service->design_uid = $design_uid;
+		$service->betrieb_uid = $betrieb_uid;
+		$service->operativ_uid = $operativ_uid;
+
+		if ($error == false)
+		{
+			if($service->save())
+			{		
+				echo '<span class="ok">Daten erfolgreich gespeichert</span>';
+				echo "<script type='text/javascript'>\n";
+				echo "	parent.uebersicht_service.location.href='service_uebersicht.php?oe_kurzbz=$oe_kurzbz';";
+				echo "</script>\n";
+				$action='update';
+				$service_id = $service->service_id;
+			}
+			else
+			{
+				$action='new';
+				echo '<span class="error">'.$service->errormsg.'</span>';
+			}
+		}
+		else 
+		{
+			$action='update';
 		}
 	}
 
@@ -145,6 +211,18 @@ $datum_obj = new datum();
 	echo '   <td><textarea name="beschreibung" cols="60" rows="5">'.htmlspecialchars($service->beschreibung).'</textarea></td>';
 	echo '</tr>';
 	echo '<tr valign="top">';
+	echo '   <td>Design</td>';
+	echo '   <td><input type="text" id="design_uid" name="design_uid" class="benutzer_uid" size="32" maxlength="32" value="'.htmlspecialchars($service->design_uid).'"></td>';
+	echo '</tr>';
+	echo '<tr valign="top">';
+	echo '   <td>Betrieb</td>';
+	echo '   <td><input type="text" id="betrieb_uid" name="betrieb_uid" class="benutzer_uid" size="32" maxlength="32" value="'.htmlspecialchars($service->betrieb_uid).'"></td>';
+	echo '</tr>';
+	echo '<tr valign="top">';
+	echo '   <td>Operativ</td>';
+	echo '   <td><input type="text" id="operativ_uid" name="operativ_uid" class="benutzer_uid" size="32" maxlength="32" value="'.htmlspecialchars($service->operativ_uid).'"></td>';
+	echo '</tr>';
+	echo '<tr valign="top">';
 	echo '   <td>Content_ID</td>';
 	echo '   <td><input type="text" name="content_id" size="8" maxlength="10" value="'.htmlspecialchars($service->content_id).'"></td>';
 	echo '</tr>';

vilesci/stammdaten/service_uebersicht.php

@@ -38,18 +38,22 @@ echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 	<title>Service</title>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	
-	<link rel="stylesheet" href="../../skin/tablesort.css" type="text/css"/>
 	<link rel="stylesheet" href="../../skin/fhcomplete.css" type="text/css">
-	<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">
-	<script type="text/javascript" src="../../include/js/jquery.js"></script> 
+	<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">';
+	
+	include('../../include/meta/jquery.php');
+	include('../../include/meta/jquery-tablesorter.php');
+	
+	echo'
 	<script type="text/javascript">
 	
 		$(document).ready(function() 
 			{ 
 			    $("#myTable").tablesorter(
 				{
-					sortList: [[2,0]],
-					widgets: [\'zebra\']
+					sortList: [[3,0],[2,0]],
+					widgets: [\'zebra\'],
+					headers: {8:{sorter:false}}
 				}); 
 			} 
 		);
@@ -121,6 +125,9 @@ echo '<table class="tablesorter" id="myTable">
 			<th>Beschreibung</th>
 			<th>Organisationseinheit</th>
 			<th>Content_ID</th>
+			<th>Design</th>
+			<th>Betrieb</th>
+			<th>Operativ</th>
 			<th colspan="3">Aktion</th>
 		</tr>
 	</thead>
@@ -134,7 +141,10 @@ foreach($service->result as $row)
 	echo '<td>',$row->beschreibung,'</td>';
 	echo '<td>',$row->oe_kurzbz,'</td>';
 	echo '<td>',$row->content_id,'</td>';
-	echo '<td><a href="service_details.php?action=update&service_id=',$row->service_id,' " target="detail_service">bearbeiten</a></td>';
+	echo '<td>',$row->design_uid,'</td>';
+	echo '<td>',$row->betrieb_uid,'</td>';
+	echo '<td>',$row->operativ_uid,'</td>';
+	echo '<td><a href="service_details.php?action=update&service_id=',$row->service_id,' " target="detail_service">bearbeiten</a>&nbsp;&nbsp;</td>';
 	echo '<td><a href="service_uebersicht.php?action=delete&service_id=',$row->service_id,' " onclick="return confdel()">entfernen</a></td>';
 	echo '</tr>';
 }